Merge pull request #10624 from keveleigh/2.8.1-cherry-picks

keveleigh · web-flow · commit 808c4390239a · 2022-05-31T14:35:46.000-07:00
2.8.1 cherry-picks from main
diff --git a/Assets/MRTK/SDK/Features/Input/Handlers/ObjectManipulator.cs b/Assets/MRTK/SDK/Features/Input/Handlers/ObjectManipulator.cs
@@ -577,6 +577,8 @@ public Vector3 GetPointerGrabPoint(uint pointerId)
         public virtual void OnPointerDown(MixedRealityPointerEventData eventData)
         {
             if (eventData.used ||
+                    eventData.Pointer == null ||
+                    eventData.Pointer.Result == null ||
                     (!allowFarManipulation && eventData.Pointer as IMixedRealityNearPointer == null))
             {
                 return;
diff --git a/Assets/MRTK/SDK/Features/UX/Scripts/Slate/FollowMeToggle.cs b/Assets/MRTK/SDK/Features/UX/Scripts/Slate/FollowMeToggle.cs
@@ -183,6 +183,11 @@ private void OnEnable()
             // Begin the follow coroutine when enabled.
             AutoFollowAtDistance = autoFollowAtDistance;
         }
+        
+        private void OnDisable()
+        {
+            autoFollowDistanceCheck = null;
+        }
 
         #endregion MonoBehaviour Implementation
 

Original file line number	Diff line number	Diff line change
`@@ -577,6 +577,8 @@ public Vector3 GetPointerGrabPoint(uint pointerId)`
`577`	`577`	`public virtual void OnPointerDown(MixedRealityPointerEventData eventData)`
`578`	`578`	`{`
`579`	`579`	`if (eventData.used \|\|`
	`580`	`+ eventData.Pointer == null \|\|`
	`581`	`+ eventData.Pointer.Result == null \|\|`
`580`	`582`	`(!allowFarManipulation && eventData.Pointer as IMixedRealityNearPointer == null))`
`581`	`583`	`{`
`582`	`584`	`return;`