Merge pull request #2457 from PJBowron/billboardCameraTolerance

Billboard camera tolerance

Author: keveleigh

Assets/HoloToolkit/Utilities/Scripts/Billboard.cs

@@ -53,18 +53,28 @@ private void OnEnable()
         {
             if (TargetTransform == null)
             {
-                TargetTransform = CameraCache.Main.transform;
+                if (CameraCache.Main != null)
+                {
+                    TargetTransform = CameraCache.Main.transform;
+                }
             }
         }
 
         /// <summary>
         /// Keeps the object facing the camera.
         /// </summary>
-        private void Update()
+        private void LateUpdate()
         {
             if (TargetTransform == null)
             {
-                return;
+                if (CameraCache.Main != null)
+                {
+                    TargetTransform = CameraCache.Main.transform;
+                }
+                else
+                {
+                    return;
+                }
             }
 
             // Get a Vector that points from the target to the main camera.