Fix fail switching default fallback render model in RenderModelHook

Author: lawwong

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Misc/RenderModelHook.cs

@@ -123,43 +123,43 @@ protected void UpdateDefaultRenderModel(bool shouldActive)
 
                 if (shouldActiveModel)
                 {
-                    var shouldActiveModelObj = m_modelObjs[shouldActiveModelNum];
-                    if (shouldActiveModelObj == null)
+                    if (!lastModelActivated || lastActivatedModel != shouldActiveModelNum)
                     {
-                        // instantiate custom override model
-                        shouldActiveModelObj = Instantiate(shouldActiveModelPrefab);
-                        shouldActiveModelObj.transform.position = Vector3.zero;
-                        shouldActiveModelObj.transform.rotation = Quaternion.identity;
-                        if (hook.m_overrideMaterial != null)
+                        var shouldActiveModelObj = m_modelObjs[shouldActiveModelNum];
+                        if (shouldActiveModelObj == null)
                         {
-                            var renderer = shouldActiveModelObj.GetComponentInChildren<Renderer>();
-                            if (renderer != null)
+                            // instantiate custom override model
+                            shouldActiveModelObj = Instantiate(shouldActiveModelPrefab);
+                            shouldActiveModelObj.transform.position = Vector3.zero;
+                            shouldActiveModelObj.transform.rotation = Quaternion.identity;
+                            if (hook.m_overrideMaterial != null)
                             {
-                                renderer.material = hook.m_overrideMaterial;
+                                var renderer = shouldActiveModelObj.GetComponentInChildren<Renderer>();
+                                if (renderer != null)
+                                {
+                                    renderer.material = hook.m_overrideMaterial;
+                                }
                             }
-                        }
-                        if (hook.m_overrideShader != null)
-                        {
-                            var renderer = shouldActiveModelObj.GetComponentInChildren<Renderer>();
-                            if (renderer != null)
+                            if (hook.m_overrideShader != null)
                             {
-                                renderer.material.shader = hook.m_overrideShader;
+                                var renderer = shouldActiveModelObj.GetComponentInChildren<Renderer>();
+                                if (renderer != null)
+                                {
+                                    renderer.material.shader = hook.m_overrideShader;
+                                }
                             }
+                            shouldActiveModelObj.transform.SetParent(hook.transform, false);
+                            m_modelObjs[shouldActiveModelNum] = shouldActiveModelObj;
+                            SendAfterModelCreatedMessage(shouldActiveModelObj, hook);
                         }
-                        shouldActiveModelObj.transform.SetParent(hook.transform, false);
-                        m_modelObjs[shouldActiveModelNum] = shouldActiveModelObj;
-                        m_activeModel = shouldActiveModelNum;
-                        m_isModelActivated = false;
-                        SendAfterModelCreatedMessage(shouldActiveModelObj, hook);
-                    }
 
-                    if (!m_isModelActivated)
-                    {
                         // active custom override model
                         if (SendBeforeModelActivatedMessage(shouldActiveModelObj, hook))
                         {
                             shouldActiveModelObj.gameObject.SetActive(true);
                         }
+
+                        m_activeModel = shouldActiveModelNum;
                         m_isModelActivated = true;
                     }
                 }