Merge remote-tracking branch 'refs/remotes/origin/master' into UNI-22861-remove-menu-items-from-Assets

# Conflicts:
#	Assets/FbxExporters/Editor/ConvertToModel.cs
#	Assets/FbxExporters/Editor/FbxExporter.cs

Author: vkovec

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -18,7 +18,7 @@ namespace Editor
     {
         public class ConvertToModel : System.IDisposable
         {
-            const string MenuItemName1 = "GameObject/Convert To Model";
+            const string MenuItemName1 = "GameObject/Convert To Prefab";
 
             /// <summary>
             /// Clean up this class on garbage collection
@@ -35,6 +35,10 @@ static void OnContextItem (MenuCommand command)
                     // We were actually invoked from the top GameObject menu,
                     // not the context menu, so treat it as such.
                     GameObject [] unityGameObjectsToConvert = Selection.GetFiltered<GameObject> (SelectionMode.Editable | SelectionMode.TopLevel);
+                    if (unityGameObjectsToConvert.Length <= 0) {
+                    ModelExporter.DisplayNoSelectionDialog ();
+                        return;
+                    }
                     Object[] result = CreateInstantiatedModelPrefab (unityGameObjectsToConvert);
                     if (result.Length>0)
                         Selection.objects = result;
@@ -123,7 +127,7 @@ public static GameObject[] CreateInstantiatedModelPrefab (GameObject [] unityGam
                     Object unityMainAsset = AssetDatabase.LoadMainAssetAtPath("Assets/" + relativePath);
 
                     if (unityMainAsset != null) {
-                        Object unityObj = PrefabUtility.InstantiatePrefab (unityMainAsset);
+                        Object unityObj = PrefabUtility.InstantiatePrefab (unityMainAsset, gosToExport[i].scene);
                         GameObject unityGO = unityObj as GameObject;
                         if (unityGO != null) 
                         {

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -1116,6 +1116,10 @@ private void ReplaceFile ()
             [MenuItem (MenuItemName, false, 30)]
             static void OnContextItem (MenuCommand command)
             {
+                if (Selection.objects.Length <= 0) {
+                    DisplayNoSelectionDialog ();
+                    return;
+                }
                 OnExport ();
             }
 
@@ -1128,6 +1132,13 @@ public static bool OnValidateMenuItem ()
                 return true;
             }
 
+            public static void DisplayNoSelectionDialog()
+            {
+                UnityEditor.EditorUtility.DisplayDialog (
+                    "Fbx Exporter Warning", 
+                    "No GameObjects selected for export.", 
+                    "Ok");
+            }
             //
             // export mesh info from Unity
             //

Assets/FbxExporters/Editor/UnitTests/ModelExporterTest.cs

@@ -123,11 +123,19 @@ public void TestConvertToValidFilename()
             // test invalid filenames
             filename = "?foo**bar///.fbx";
             result = FbxExporters.Editor.ModelExporter.ConvertToValidFilename (filename);
+#if UNITY_EDITOR_WIN
             Assert.AreEqual ("_foo__bar___.fbx", result);
+#else
+            Assert.AreEqual ("?foo**bar___.fbx", result);
+#endif
 
             filename = "foo$?ba%r 2.fbx";
             result = FbxExporters.Editor.ModelExporter.ConvertToValidFilename (filename);
+#if UNITY_EDITOR_WIN
             Assert.AreEqual ("foo$_ba%r 2.fbx", result);
+#else
+            Assert.AreEqual ("foo$?ba%r 2.fbx", result);
+#endif
         }
     }
 }