Merge pull request #9665 from keveleigh/remove-deprecated-method

keveleigh · web-flow · commit a7c8710d7583 · 2021-04-16T09:49:38.000-07:00
Update to use non-obsolete method in WMR controller
diff --git a/Assets/MRTK/Providers/WindowsMixedReality/XR2018/Controllers/WindowsMixedRealityController.cs b/Assets/MRTK/Providers/WindowsMixedReality/XR2018/Controllers/WindowsMixedRealityController.cs
@@ -238,7 +238,7 @@ private void UpdateMenuData(InteractionSourceState interactionSourceState, Mixed
         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
`@@ -238,7 +238,7 @@ private void UpdateMenuData(InteractionSourceState interactionSourceState, Mixed`
`238`	`238`	`protected override bool TryRenderControllerModel(System.Type controllerType, InputSourceType inputSourceType)`
`239`	`239`	`{`
`240`	`240`	`if (GetControllerVisualizationProfile() == null \|\|`
`241`		`- !GetControllerVisualizationProfile().GetUseDefaultModelsOverride(GetType(), ControllerHandedness))`
	`241`	`+ !GetControllerVisualizationProfile().GetUsePlatformModelsOverride(GetType(), ControllerHandedness))`
`242`	`242`	`{`
`243`	`243`	`return base.TryRenderControllerModel(controllerType, inputSourceType);`
`244`	`244`	`}`