Skip to content

Commit

Permalink
Merge pull request microsoft#11 from Microsoft/june18_dev
Browse files Browse the repository at this point in the history
June18 dev
  • Loading branch information
Ecnassianer authored Jun 4, 2018
2 parents cba36c7 + 92d85dd commit 5837eca
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
4 changes: 3 additions & 1 deletion Assets/HoloToolkit/UX/Scripts/UICollection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ private void Start()
// Verify this is attached to a GameObject with a rect transform
rectTransform = GetComponent<RectTransform>();

if (!Application.isEditor) { return; }

// Collect children items already added (likely added in the Editor)
CollectItems();
UpdateLayout();
Expand Down Expand Up @@ -121,7 +123,7 @@ public void RemoveAllItems()
}

private void CollectItems()
{
{
Items.Clear();

foreach (Transform childTransform in transform)
Expand Down
6 changes: 4 additions & 2 deletions Assets/HoloToolkit/Utilities/Scripts/BoundingBoxHelper.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System.Collections;
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

using System.Collections.Generic;
using UnityEngine;

Expand All @@ -10,7 +12,7 @@
/// The dynamic functions can be used to obtain boundingcube info on an object's Update loop. Operations
/// are minimized in the dynamic use scenario.
/// </summary>
public class BoundingBoxHelper : MonoBehaviour
public class BoundingBoxHelper
{
readonly int[] face0 = { 0, 1, 3, 2 };
readonly int[] face1 = { 1, 5, 7, 3 };
Expand Down
13 changes: 13 additions & 0 deletions Assets/HoloToolkit/Utilities/Scripts/BoundingBoxHelper.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 5837eca

Please sign in to comment.