Merge pull request #1805 from JWNJWN/bug/highlighter-IOR

fix(highlighter): index out of range
ExtendRealityLtd · May 18, 2018 · 664540f · 664540f
2 parents 94ad07e + ccc7ac1
commit 664540f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Assets/VRTK/Source/Scripts/Interactions/Highlighters/VRTK_OutlineObjectCopyHighlighter.cs b/Assets/VRTK/Source/Scripts/Interactions/Highlighters/VRTK_OutlineObjectCopyHighlighter.cs
@@ -163,7 +163,7 @@ protected virtual void ResetHighlighterWithCustomModelPaths()
         {
             if (customOutlineModelPaths != null && customOutlineModelPaths.Length > 0)
             {
-                highlightModels = new Renderer[customOutlineModels.Length];
+                highlightModels = new Renderer[customOutlineModelPaths.Length];
                 for (int i = 0; i < customOutlineModelPaths.Length; i++)
                 {
                     highlightModels[i] = CreateHighlightModel(null, customOutlineModelPaths[i]);
@@ -231,7 +231,10 @@ protected virtual Renderer CreateHighlightModel(GameObject givenOutlineModel, st
             {
                 Renderer copyModelRenderer = objectToAffect.GetComponentInChildren<Renderer>();
                 copyModel = (copyModelRenderer != null ? copyModelRenderer.gameObject : null);
+            }
 
+            if (copyModel == null)
+            { 
                 VRTK_Logger.Error(VRTK_Logger.GetCommonMessage(VRTK_Logger.CommonMessageKeys.REQUIRED_COMPONENT_MISSING_FROM_GAMEOBJECT, "VRTK_OutlineObjectCopyHighlighter", "Renderer", "the same or child", " to add the highlighter to"));
                 return null;
             }