Merge branch 'mrtk_development' into vNEXT-OpenVR-MouseInputFixes

StephenHodgson · StephenHodgson · commit c064380a31c8 · 2018-10-29T10:31:28.000-07:00
diff --git a/Assets/MixedRealityToolkit-SDK/Features/Utilities/Solvers/ControllerFinder.cs b/Assets/MixedRealityToolkit-SDK/Features/Utilities/Solvers/ControllerFinder.cs
@@ -55,15 +55,15 @@ protected virtual void OnEnable()
 
         public void OnSourceDetected(SourceStateEventData eventData)
         {
-            if (eventData.Controller.ControllerHandedness == handedness)
+            if (eventData.Controller?.ControllerHandedness == handedness)
             {
                 AddControllerTransform(eventData.Controller);
             }
         }
 
         public void OnSourceLost(SourceStateEventData eventData)
         {
-            if (eventData.Controller.ControllerHandedness == handedness)
+            if (eventData.Controller?.ControllerHandedness == handedness)
             {
                 RemoveControllerTransform();
             }

Original file line number	Diff line number	Diff line change
`@@ -55,15 +55,15 @@ protected virtual void OnEnable()`
`55`	`55`
`56`	`56`	`public void OnSourceDetected(SourceStateEventData eventData)`
`57`	`57`	`{`
`58`		`- if (eventData.Controller.ControllerHandedness == handedness)`
	`58`	`+ if (eventData.Controller?.ControllerHandedness == handedness)`
`59`	`59`	`{`
`60`	`60`	`AddControllerTransform(eventData.Controller);`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public void OnSourceLost(SourceStateEventData eventData)`
`65`	`65`	`{`
`66`		`- if (eventData.Controller.ControllerHandedness == handedness)`
	`66`	`+ if (eventData.Controller?.ControllerHandedness == handedness)`
`67`	`67`	`{`
`68`	`68`	`RemoveControllerTransform();`
`69`	`69`	`}`