updated base controller model fetching.

Reverted nessicary property name change.

Author: StephenHodgson

Assets/MixedRealityToolkit-SDK/Features/Input/Handlers/ControllerPoseSynchronizer.cs

@@ -27,13 +27,13 @@ public class ControllerPoseSynchronizer : InputSystemGlobalListener, IMixedReali
 
         [SerializeField]
         [Tooltip("Should this GameObject clean itself up when it's controller is lost?")]
-        private bool destroyOnLost = true;
+        private bool destroyOnSourceLost = true;
 
         /// <inheritdoc />
         public bool DestroyOnLost
         {
-            get { return destroyOnLost; }
-            set { destroyOnLost = value; }
+            get { return destroyOnSourceLost; }
+            set { destroyOnSourceLost = value; }
         }
 
         /// <summary>
@@ -104,7 +104,7 @@ public virtual void OnSourceLost(SourceStateEventData eventData)
                 IsTracked = false;
                 TrackingState = TrackingState.NotTracked;
 
-                if (destroyOnLost)
+                if (destroyOnSourceLost)
                 {
                     if (Application.isEditor)
                     {

Assets/MixedRealityToolkit/_Core/Devices/BaseController.cs

@@ -157,26 +157,25 @@ private void TryRenderControllerModel(Type controllerType)
         {
             GameObject controllerModel = null;
 
-            // Get the global controller model for each hand.
-            if (ControllerHandedness == Handedness.Left && MixedRealityManager.Instance.ActiveProfile.ControllerMappingProfile.GlobalLeftHandModel != null)
-            {
-                controllerModel = MixedRealityManager.Instance.ActiveProfile.ControllerMappingProfile.GlobalLeftHandModel;
-            }
-            else if (ControllerHandedness == Handedness.Right && MixedRealityManager.Instance.ActiveProfile.ControllerMappingProfile.GlobalRightHandModel != null)
-            {
-                controllerModel = MixedRealityManager.Instance.ActiveProfile.ControllerMappingProfile.GlobalRightHandModel;
-            }
+            if (!MixedRealityManager.Instance.ActiveProfile.ControllerMappingProfile.RenderMotionControllers) { return; }
 
             // If a specific controller template wants to override the global model, assign that instead.
             if (MixedRealityManager.Instance.ActiveProfile.IsControllerMappingEnabled &&
-                MixedRealityManager.Instance.ActiveProfile.ControllerMappingProfile.RenderMotionControllers &&
-               !MixedRealityManager.Instance.ActiveProfile.ControllerMappingProfile.UseDefaultModels)
+                !MixedRealityManager.Instance.ActiveProfile.ControllerMappingProfile.UseDefaultModels)
             {
-                var controllerModelType = MixedRealityManager.Instance.ActiveProfile.ControllerMappingProfile.GetControllerModelOverride(controllerType, ControllerHandedness);
+                controllerModel = MixedRealityManager.Instance.ActiveProfile.ControllerMappingProfile.GetControllerModelOverride(controllerType, ControllerHandedness);
+            }
 
-                if (controllerModelType != null)
+            // Get the global controller model for each hand.
+            if (controllerModel == null)
+            {
+                if (ControllerHandedness == Handedness.Left && MixedRealityManager.Instance.ActiveProfile.ControllerMappingProfile.GlobalLeftHandModel != null)
+                {
+                    controllerModel = MixedRealityManager.Instance.ActiveProfile.ControllerMappingProfile.GlobalLeftHandModel;
+                }
+                else if (ControllerHandedness == Handedness.Right && MixedRealityManager.Instance.ActiveProfile.ControllerMappingProfile.GlobalRightHandModel != null)
                 {
-                    controllerModel = controllerModelType;
+                    controllerModel = MixedRealityManager.Instance.ActiveProfile.ControllerMappingProfile.GlobalRightHandModel;
                 }
             }