Merge pull request #528 from moisoiu/master

Stephen Hodgson · web-flow · commit c5f465eea738 · 2017-02-23T13:44:36.000-05:00
Compatibility with Vuforia: GazeTransform initialization.
diff --git a/Assets/HoloToolkit/Input/Scripts/Gaze/GazeManager.cs b/Assets/HoloToolkit/Input/Scripts/Gaze/GazeManager.cs
@@ -106,7 +106,10 @@ protected override void Awake()
             {
                 RaycastLayerMasks = new LayerMask[] { Physics.DefaultRaycastLayers };
             }
+        }
 
+        private void Start()
+        {
             if (GazeTransform == null)
             {
                 if (Camera.main != null)

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,10 @@ protected override void Awake()`
`106`	`106`	`{`
`107`	`107`	`RaycastLayerMasks = new LayerMask[] { Physics.DefaultRaycastLayers };`
`108`	`108`	`}`
	`109`	`+ }`
`109`	`110`
	`111`	`+ private void Start()`
	`112`	`+ {`
`110`	`113`	`if (GazeTransform == null)`
`111`	`114`	`{`
`112`	`115`	`if (Camera.main != null)`