fix(Interaction): only instance materials if highlight is used

VRTK_Interactable object grabs each material to change the color if highlighting is used. This breaks batching support in Unity and so it is now only set if highlighting is actually used.
ExtendRealityLtd · Aug 30, 2016 · d1c53e8 · d1c53e8
1 parent ebf7b0e
commit d1c53e8
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/Assets/VRTK/Scripts/VRTK_InteractableObject.cs b/Assets/VRTK/Scripts/VRTK_InteractableObject.cs
@@ -264,6 +264,11 @@ public virtual void ToggleHighlight(bool toggle, Color globalHighlightColor)
                     Color color = (touchHighlightColor != Color.clear ? touchHighlightColor : globalHighlightColor);
                     if (color != Color.clear)
                     {
+                        if (originalObjectColours == null)
+                        {
+                            originalObjectColours = StoreOriginalColors();
+                        }
+
                         var colorArray = BuildHighlightColorArray(color);
                         ChangeColor(colorArray);
                     }
@@ -421,7 +426,10 @@ protected virtual void Awake()
 
         protected virtual void Start()
         {
-            originalObjectColours = StoreOriginalColors();
+            if (highlightOnTouch)
+            {
+                originalObjectColours = StoreOriginalColors();
+            }
         }
 
         protected virtual void Update()