Merge pull request #378 from Unity-Technologies/uni-40523-convert-from-asset

Uni 40523 convert from asset

Author: benoithudson

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -48,18 +48,19 @@ protected void SetGameObjectsToConvert(IEnumerable<GameObject> toConvert){
                 if (ToExport.Length == 1) {
                     var go = ModelExporter.GetGameObject (ToExport [0]);
                     // check if the GameObject is a model instance, use as default filename and path if it is
-                    if(ConvertToModel.IsModelInstance(go)) {
-                        var mainAsset = PrefabUtility.GetPrefabParent (go) as GameObject;
+                    var mainAsset = ConvertToModel.GetFbxAssetOrNull(go);
+                    if (!mainAsset) {
+                        // Use the game object's name
+                        m_prefabFileName = go.name;
+                    } else {
+                        // Use the asset's name
                         var mainAssetRelPath = AssetDatabase.GetAssetPath (mainAsset);
                         // remove Assets/ from beginning of path
                         mainAssetRelPath = mainAssetRelPath.Substring ("Assets".Length);
 
                         m_prefabFileName = System.IO.Path.GetFileNameWithoutExtension (mainAssetRelPath);
                         ExportSettings.AddFbxSavePath (System.IO.Path.GetDirectoryName (mainAssetRelPath));
                     }
-                    else{
-                        m_prefabFileName = ToExport [0].name;
-                    }
 
                     // if only one object selected, set transfer source/dest to this object
                     if (go) {
@@ -144,28 +145,17 @@ protected override bool Export ()
                 if (ToExport.Length == 1) {
                     var go = ModelExporter.GetGameObject (ToExport [0]);
 
-                    if (!OverwriteExistingFile (prefabPath)) {
-                        return false;
-                    }
-
-                    // Only create the prefab (no FBX export) if we have selected the root of a model prefab instance.
-                    if(ConvertToModel.IsModelInstance(go)) {
-                        // don't re-export fbx
-                        // create prefab out of model instance in scene, link to existing fbx
-                        var mainAsset = PrefabUtility.GetPrefabParent(go) as GameObject;
-                        var mainAssetRelPath = AssetDatabase.GetAssetPath(mainAsset);
-                        var mainAssetAbsPath = System.IO.Directory.GetParent(Application.dataPath) + "/" + mainAssetRelPath;
-                        var relPrefabPath = ExportSettings.GetProjectRelativePath (prefabPath);
-
-                        if (string.Equals(System.IO.Path.GetFullPath(fbxPath), System.IO.Path.GetFullPath(mainAssetAbsPath))) {
-                            ConvertToModel.SetupFbxPrefab(go, mainAsset, relPrefabPath, mainAssetAbsPath);
-                            return true;
+                    // Check if we'll be clobbering files. If so, warn the user
+                    // first and let them cancel out.
+                    if (ConvertToModel.WillCreatePrefab(go)) {
+                        if (!OverwriteExistingFile (prefabPath)) {
+                            return false;
                         }
                     }
-
-                    // check if file already exists, give a warning if it does
-                    if (!OverwriteExistingFile (fbxPath)) {
-                        return false;
+                    if (ConvertToModel.WillExportFbx(go)) {
+                        if (!OverwriteExistingFile (fbxPath)) {
+                            return false;
+                        }
                     }
 
                     ConvertToModel.Convert (
@@ -175,6 +165,7 @@ protected override bool Export ()
                 }
 
                 foreach (var obj in ToExport) {
+                    // Convert, automatically choosing a file path that won't clobber any existing files.
                     var go = ModelExporter.GetGameObject (obj);
                     ConvertToModel.Convert (
                         go, fbxDirectoryFullPath: fbxDirPath, prefabDirectoryFullPath: prefabDirPath, exportOptions: ExportSettings.instance.convertToPrefabSettings.info

Assets/FbxExporters/Editor/ConvertToPrefabEditorWindow.cs

@@ -246,11 +246,18 @@ public static bool OnValidateMenuItem()
         /// <summary>
         /// Launch the manual update of the linked prefab specified
         /// </summary>
-        public static void UpdateLinkedPrefab(GameObject prefabInstance)
+        public static void UpdateLinkedPrefab(GameObject prefabOrInstance)
         {
-            GameObject prefab = UnityEditor.PrefabUtility.GetPrefabParent(prefabInstance) as GameObject;
-            if (!prefab)
-            {
+            // Find the prefab, bail if this is neither a prefab nor an instance.
+            GameObject prefab;
+            switch(PrefabUtility.GetPrefabType(prefabOrInstance)) {
+            case PrefabType.Prefab:
+                prefab = prefabOrInstance;
+                break;
+            case PrefabType.PrefabInstance:
+                prefab = PrefabUtility.GetPrefabParent(prefabOrInstance) as GameObject;
+                break;
+            default:
                 return;
             }