Merge pull request #3178 from keveleigh/fix-pointer-registration

David Kline · web-flow · commit 2a7922c435ef · 2018-11-21T07:47:13.000-08:00
Fix overwriting bool in RequestPointers
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/BaseDeviceManager.cs b/Assets/MixedRealityToolkit/_Core/Devices/BaseDeviceManager.cs
@@ -44,12 +44,7 @@ protected virtual IMixedRealityPointer[] RequestPointers(SystemType controllerTy
                 {
                     var pointerProfile = MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.PointerProfile.PointerOptions[i];
 
-                    if (!useSpecificType)
-                    {
-                        useSpecificType = pointerProfile.ControllerType.Type != null;
-                    }
-
-                    if ((!useSpecificType || pointerProfile.ControllerType.Type == controllerType.Type) &&
+                    if (((useSpecificType && pointerProfile.ControllerType.Type == controllerType.Type) || (!useSpecificType && pointerProfile.ControllerType.Type == null)) &&
                         (pointerProfile.Handedness == Handedness.Any || pointerProfile.Handedness == Handedness.Both || pointerProfile.Handedness == controllingHand))
                     {
                         var pointerObject = Object.Instantiate(pointerProfile.PointerPrefab);

Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,7 @@ protected virtual IMixedRealityPointer[] RequestPointers(SystemType controllerTy`
`44`	`44`	`{`
`45`	`45`	`var pointerProfile = MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.PointerProfile.PointerOptions[i];`
`46`	`46`
`47`		`- if (!useSpecificType)`
`48`		`- {`
`49`		`- useSpecificType = pointerProfile.ControllerType.Type != null;`
`50`		`- }`
`51`		`-`
`52`		`- if ((!useSpecificType \|\| pointerProfile.ControllerType.Type == controllerType.Type) &&`
	`47`	`+ if (((useSpecificType && pointerProfile.ControllerType.Type == controllerType.Type) \|\| (!useSpecificType && pointerProfile.ControllerType.Type == null)) &&`
`53`	`48`	`(pointerProfile.Handedness == Handedness.Any \|\| pointerProfile.Handedness == Handedness.Both \|\| pointerProfile.Handedness == controllingHand))`
`54`	`49`	`{`
`55`	`50`	`var pointerObject = Object.Instantiate(pointerProfile.PointerPrefab);`