Merge pull request #864 from Zod-/CameraCache

Fix null coalescing causing errors

Author: StephenHodgson

Assets/HoloToolkit/Input/Scripts/Gaze/GazeManager.cs

@@ -138,8 +138,12 @@ private void Update()
 
         private bool FindGazeTransform()
         {
-            GazeTransform = GazeTransform ?? CameraCache.Main.transform;
-            if (GazeTransform != null) return true;
+            if (GazeTransform != null) { return true; }
+            if (CameraCache.Main != null)
+            {
+                GazeTransform = CameraCache.Main.transform;
+                return true;
+            }
 
             Debug.LogError("Gaze Manager was not given a GazeTransform and no main camera exists to default to.");
             return false;

Assets/HoloToolkit/Utilities/Scripts/CameraCache.cs

@@ -20,7 +20,11 @@ public static Camera Main
         {
             get
             {
-                return cachedCamera ?? Refresh(Camera.main);
+                if (cachedCamera == null)
+                {
+                    return Refresh(Camera.main);
+                }
+                return cachedCamera;
             }
         }