Merge pull request #526 from Unity-Technologies/1242332-focus-grab-on-convert

bug #1242332 - [Mac] Editor focus lockup when exporting an FBX using …

Author: benoithudson

com.unity.formats.fbx/Editor/ConvertToNestedPrefab.cs

@@ -281,7 +281,17 @@ private static object GetPropertyReflection(object instance, string propertyName
         internal static List<GameObject> GetSceneReferencesToObject(Object obj)
         {
             var sceneHierarchyWindowType = typeof(UnityEditor.SearchableEditorWindow).Assembly.GetType("UnityEditor.SceneHierarchyWindow");
-            var sceneHierarchyWindow = EditorWindow.GetWindow(sceneHierarchyWindowType);
+
+            // bug 1242332: don't grab the focus!
+            // The arguments aren't actually optional so they must all be named.
+            //
+            // todo: We should cache all the window-getting and reflection so it
+            // happens not once per object but once per convert.
+            var sceneHierarchyWindow = EditorWindow.GetWindow(
+                    t: sceneHierarchyWindowType,
+                    utility: false,
+                    title: null,
+                    focus: false);
             var instanceID = obj.GetInstanceID();
             var idFormat = "ref:{0}:";
 
@@ -994,4 +1004,4 @@ internal static void CopyComponents(GameObject to, GameObject from, GameObject r
             }
         }
     }
-}
+}