Merge pull request #9633 from keveleigh/fix-2019

keveleigh · web-flow · commit b1d2d6f224be · 2021-04-07T13:44:04.000-07:00
Update to use non-obsolete method in WMR controller
diff --git a/Assets/MRTK/Providers/WindowsMixedReality/XRSDK/Controllers/WindowsMixedRealityXRSDKMotionController.cs b/Assets/MRTK/Providers/WindowsMixedReality/XRSDK/Controllers/WindowsMixedRealityXRSDKMotionController.cs
@@ -140,7 +140,7 @@ protected override void UpdateDualAxisData(MixedRealityInteractionMapping intera
         protected override bool TryRenderControllerModel(System.Type controllerType, InputSourceType inputSourceType)
         {
             if (GetControllerVisualizationProfile() == null ||
-                !GetControllerVisualizationProfile().GetUseDefaultModelsOverride(GetType(), ControllerHandedness))
+                !GetControllerVisualizationProfile().GetUsePlatformModelsOverride(GetType(), ControllerHandedness))
             {
                 return base.TryRenderControllerModel(controllerType, inputSourceType);
             }

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ protected override void UpdateDualAxisData(MixedRealityInteractionMapping intera`
`140`	`140`	`protected override bool TryRenderControllerModel(System.Type controllerType, InputSourceType inputSourceType)`
`141`	`141`	`{`
`142`	`142`	`if (GetControllerVisualizationProfile() == null \|\|`
`143`		`- !GetControllerVisualizationProfile().GetUseDefaultModelsOverride(GetType(), ControllerHandedness))`
	`143`	`+ !GetControllerVisualizationProfile().GetUsePlatformModelsOverride(GetType(), ControllerHandedness))`
`144`	`144`	`{`
`145`	`145`	`return base.TryRenderControllerModel(controllerType, inputSourceType);`
`146`	`146`	`}`