integrate changes from dev_working

Author: David Kline (ANALOG)

Assets/HoloToolkit/Input/Scripts/Focus/FocusManager.cs

@@ -343,21 +343,12 @@ public void UnregisterPointer(IPointingSource pointingSource)
 
         public GameObject TryGetFocusedObject(BaseEventData eventData)
         {
-            FocusDetails? details = TryGetFocusDetails(eventData);
-
-            if (details == null)
-            {
-                return null;
-            }
-
             IPointingSource pointingSource;
             TryGetPointingSource(eventData, out pointingSource);
             PointerInputEventData pointerInputEventData = GetSpecificPointerEventData(pointingSource);
 
             Debug.Assert(pointerInputEventData != null);
-            pointerInputEventData.selectedObject = details.Value.Object;
-
-            return details.Value.Object;
+            return pointerInputEventData.selectedObject;
         }
 
         public bool TryGetPointingSource(BaseEventData eventData, out IPointingSource pointingSource)
@@ -440,7 +431,11 @@ public PointerInputEventData GetGazePointerEventData()
         public PointerInputEventData GetSpecificPointerEventData(IPointingSource pointer)
         {
             PointerData pointerEventData;
-            return GetPointerData(pointer, out pointerEventData) ? pointerEventData.UnityUIPointerData : null;
+
+            if (!GetPointerData(pointer, out pointerEventData)) { return null; }
+
+            pointerEventData.UnityUIPointerData.selectedObject = GetFocusedObject(pointer);
+            return pointerEventData.UnityUIPointerData;
         }
 
         public float GetPointingExtent(IPointingSource pointingSource)

Assets/HoloToolkit/Input/Scripts/Utilities/Managers/InputManager.cs

@@ -435,8 +435,12 @@ public void RaiseSourceUp(IInputSource source, uint sourceId, InteractionSourceP
                 pointerInputEventData.InputSource = source;
                 pointerInputEventData.SourceId = sourceId;
 
-                ExecuteEvents.ExecuteHierarchy(inputEventData.selectedObject, pointerInputEventData, ExecuteEvents.pointerUpHandler);
-                ExecuteEvents.ExecuteHierarchy(inputEventData.selectedObject, pointerInputEventData, ExecuteEvents.pointerClickHandler);
+                if (inputEventData.selectedObject != null)
+                {
+                    ExecuteEvents.ExecuteHierarchy(inputEventData.selectedObject, pointerInputEventData, ExecuteEvents.pointerUpHandler);
+                    ExecuteEvents.ExecuteHierarchy(inputEventData.selectedObject, pointerInputEventData, ExecuteEvents.pointerClickHandler);
+                }
+
                 pointerInputEventData.Clear();
             }
         }
@@ -473,7 +477,10 @@ public void RaiseSourceDown(IInputSource source, uint sourceId, InteractionSourc
                 pointerInputEventData.pressPosition = pointerInputEventData.position;
                 pointerInputEventData.pointerPressRaycast = pointerInputEventData.pointerCurrentRaycast;
 
-                ExecuteEvents.ExecuteHierarchy(inputEventData.selectedObject, pointerInputEventData, ExecuteEvents.pointerDownHandler);
+                if (inputEventData.selectedObject != null)
+                {
+                    ExecuteEvents.ExecuteHierarchy(inputEventData.selectedObject, pointerInputEventData, ExecuteEvents.pointerDownHandler);
+                }
             }
         }