Changed sharedMaterial reference to just material reference to prevent changing all materials. Also explicitly destroy material reference when we destroy the game object.

Author: Stephen Hodgson

Assets/HoloToolkit/Input/Tests/Scripts/FocusedObjectColorChanger.cs

@@ -17,7 +17,7 @@ public class FocusedObjectColorChanger : MonoBehaviour, IFocusable
 
         private void Awake()
         {
-            cachedMaterial = GetComponent<Renderer>().sharedMaterial;
+            cachedMaterial = GetComponent<Renderer>().material;
             originalColor = cachedMaterial.GetColor("_Color");
         }
 
@@ -30,5 +30,10 @@ public void OnFocusExit()
         {
             cachedMaterial.SetColor("_Color", originalColor);
         }
+
+        private void OnDestroy()
+        {
+            DestroyImmediate(cachedMaterial);
+        }
     }
 }

Assets/HoloToolkit/Input/Tests/Scripts/SelectedObjectMessageReceiver.cs

@@ -17,7 +17,7 @@ public class SelectedObjectMessageReceiver : MonoBehaviour
 
         private void Awake()
         {
-            cachedMaterial = GetComponent<Renderer>().sharedMaterial;
+            cachedMaterial = GetComponent<Renderer>().material;
             originalColor = cachedMaterial.GetColor("_Color");
         }
 
@@ -30,5 +30,10 @@ public void OnClearSelection()
         {
             cachedMaterial.SetColor("_Color", originalColor);
         }
+
+        private void OnDestroy()
+        {
+            DestroyImmediate(cachedMaterial);
+        }
     }
 }

Assets/HoloToolkit/Input/Tests/Scripts/SphereGlobalKeywords.cs

@@ -17,7 +17,7 @@ private void Awake()
                 cachedChildMaterials = new Material[childRenderers.Length];
                 for (int i = 0; i < childRenderers.Length; i++)
                 {
-                    cachedChildMaterials[i] = childRenderers[i].sharedMaterial;
+                    cachedChildMaterials[i] = childRenderers[i].material;
                 }
             }
         }
@@ -34,5 +34,13 @@ public void OnSpeechKeywordRecognized(SpeechKeywordRecognizedEventData eventData
                     break;
             }
         }
+
+        private void OnDestroy()
+        {
+            for (int i = 0; i < cachedChildMaterials.Length; i++)
+            {
+                DestroyImmediate(cachedChildMaterials[i]);
+            }
+        }
     }
 }

Assets/HoloToolkit/Input/Tests/Scripts/SphereKeywords.cs

@@ -12,7 +12,7 @@ public class SphereKeywords : MonoBehaviour, ISpeechHandler
 
         private void Awake()
         {
-            cachedMaterial = GetComponent<Renderer>().sharedMaterial;
+            cachedMaterial = GetComponent<Renderer>().material;
         }
 
         public void ChangeColor(string color)
@@ -35,5 +35,10 @@ public void OnSpeechKeywordRecognized(SpeechKeywordRecognizedEventData eventData
         {
             ChangeColor(eventData.RecognizedText);
         }
+
+        private void OnDestroy()
+        {
+            DestroyImmediate(cachedMaterial);
+        }
     }
 }

Assets/HoloToolkit/Input/Tests/Scripts/TestButton.cs

@@ -105,7 +105,7 @@ protected virtual void OnEnable()
             // Set the initial alpha
             if (ToolTipRenderer != null)
             {
-                cachedToolTipMaterial = ToolTipRenderer.sharedMaterial;
+                cachedToolTipMaterial = ToolTipRenderer.material;
 
                 Color tipColor = cachedToolTipMaterial.GetColor("_Color");
                 tipColor.a = 0.0f;
@@ -231,5 +231,10 @@ public void OnFocusExit()
 
             UpdateVisuals();
         }
+
+        private void OnDestroy()
+        {
+            DestroyImmediate(cachedToolTipMaterial);
+        }
     }
 }

Assets/HoloToolkit/Sharing/Scripts/Utilities/Utils.cs

@@ -126,7 +126,7 @@ public static void SetMaterialRecursiveForName(Transform t, Material mat, string
         {
             if (t.gameObject && t.gameObject.GetComponent<Renderer>() && t.gameObject.name == nameToTest)
             {
-                t.gameObject.GetComponent<Renderer>().sharedMaterial = mat;
+                t.gameObject.GetComponent<Renderer>().material = mat;
             }
 
             for (int ii = 0; ii < t.childCount; ++ii)

Assets/HoloToolkit/Utilities/Scripts/DirectionIndicator.cs

@@ -34,6 +34,9 @@ public class DirectionIndicator : MonoBehaviour
         // Cache the MeshRenderer for the on-cursor indicator since it will be enabled and disabled frequently.
         private Renderer directionIndicatorRenderer;
 
+        // Cache the Material to prevent material leak.
+        private Material indicatorMaterial;
+
         // Check if the cursor direction indicator is visible.
         private bool isDirectionIndicatorVisible;
 
@@ -60,6 +63,7 @@ public void Awake()
 
         public void OnDestroy()
         {
+            DestroyImmediate(indicatorMaterial);
             Destroy(DirectionIndicatorObject);
         }
 
@@ -90,7 +94,7 @@ private GameObject InstantiateDirectionIndicator(GameObject directionIndicator)
                 Destroy(rigidBody);
             }
 
-            Material indicatorMaterial = directionIndicatorRenderer.sharedMaterial;
+            indicatorMaterial = directionIndicatorRenderer.material;
             indicatorMaterial.color = DirectionIndicatorColor;
             indicatorMaterial.SetColor("_TintColor", DirectionIndicatorColor);