Merge pull request #1122 from timGerken/Dev_Unity_2017.2.0

Add a null-check of TeleportMarker before instantiating the object.

Author: StephenHodgson

Assets/HoloToolkit/Input/Scripts/Utilities/Managers/MixedRealityTeleport.cs

@@ -66,13 +66,16 @@ private void Start()
                 return;
             }
 
-            teleportMarker = Instantiate(TeleportMarker);
-            teleportMarker.SetActive(false);
-
-            animationController = teleportMarker.GetComponentInChildren<Animator>();
-            if (animationController != null)
+            if (TeleportMarker != null)
             {
-                animationController.StopPlayback();
+                teleportMarker = Instantiate(TeleportMarker);
+                teleportMarker.SetActive(false);
+
+                animationController = teleportMarker.GetComponentInChildren<Animator>();
+                if (animationController != null)
+                {
+                    animationController.StopPlayback();
+                }
             }
         }
 

Assets/HoloToolkit/Utilities/Scripts/FadeScript.cs

@@ -9,6 +9,8 @@ namespace HoloToolkit.Unity
 {
     public class FadeScript : SingleInstance<FadeScript>
     {
+        [Tooltip("If true, the FadeScript will update the shared material. Useful for fading multiple cameras that each render different layers.")]
+        public bool FadeSharedMaterial = false;
         Material fadeMaterial;
         Color fadeColor = Color.black;
 
@@ -46,7 +48,14 @@ void Start()
 #endif
 
             currentState = FadeState.idle;
-            fadeMaterial = GetComponentInChildren<MeshRenderer>().material;
+            if (FadeSharedMaterial)
+            {
+                fadeMaterial = GetComponentInChildren<MeshRenderer>().sharedMaterial;
+            }
+            else
+            {
+                fadeMaterial = GetComponentInChildren<MeshRenderer>().material;
+            }
         }
 
         void Update()
@@ -90,7 +99,7 @@ void CalculateFade()
 
         protected override void OnDestroy()
         {
-            if (fadeMaterial != null)
+            if (fadeMaterial != null && !FadeSharedMaterial)
             {
                 Destroy(fadeMaterial);
             }