Merge dev into this

Unity-Technologies · Sep 23, 2016 · cdcad9d · cdcad9d
2 parents 1564f89 + 163b2a9
commit cdcad9d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/Models/Materials.meta b/Models/Materials.meta
diff --git a/Scripts/EditorVR.cs b/Scripts/EditorVR.cs
@@ -189,7 +189,7 @@ private void OnDisable()
 
 	private void OnSceneGUI(EditorWindow obj)
 	{
-		if (Event.current.type == EventType.MouseMove)
+		if (Event.current.type == EventType.ExecuteCommand)
 		{
 			var miniWorldRayHasObject = false;
 
@@ -258,10 +258,15 @@ private void Update()
 
 		UpdateMiniWorldRays();
 #if UNITY_EDITOR
-		// HACK: Send a "mouse moved" event, so scene picking can occur for the controller
-		Event e = new Event();
-		e.type = EventType.MouseMove;
-		VRView.activeView.SendEvent(e);
+		// HACK: Send a custom event, so that OnSceneGUI gets called, which is requirement for scene picking to occur
+		//		Additionally, on some machines it's required to do a delay call otherwise none of this works
+		EditorApplication.delayCall += () =>
+		{
+			Event e = new Event();
+			e.type = EventType.ExecuteCommand;
+			if (this != null) // Because this is a delay call, the component will be null when EditorVR closes
+				VRView.activeView.SendEvent(e);
+		};
 #endif
 	}
 

diff --git a/Models/Materials/StandardOverlay.shader → Shaders/StandardOverlay.shader b/Models/Materials/StandardOverlay.shader → Shaders/StandardOverlay.shader
diff --git a/Models/Materials/StandardOverlay.shader.meta → Shaders/StandardOverlay.shader.meta b/Models/Materials/StandardOverlay.shader.meta → Shaders/StandardOverlay.shader.meta