Offer a setting to keep-original, default off, not in inspector.

Includes tests to make sure it worked.

Slight API change.

Author: Benoit Hudson

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -62,6 +62,23 @@ public static bool OnValidateMenuItem ()
                 return true;
             }
 
+            /// <summary>
+            /// After a convert-to-model, we normally delete the original object.
+            /// That can be overridden.
+            /// </summary>
+            public enum KeepOriginal {
+                Default, // Use the export settings.
+                Keep, // Don't delete, just rename it.
+                Delete, // Delete the original hierarchy.
+            }
+
+            /// <summary>
+            /// Gets the export settings.
+            /// </summary>
+            public static EditorTools.ExportSettings ExportSettings {
+                get { return EditorTools.ExportSettings.instance; }
+            }
+
             /// <summary>
             /// Create instantiated model prefabs from a selection of objects.
             ///
@@ -73,7 +90,10 @@ public static bool OnValidateMenuItem ()
             /// <param name="unityGameObjectsToConvert">Unity game objects to convert to Model Prefab instances</param>
             /// <param name="path">Path to save Model Prefab; use FbxExportSettings if null</param>
             /// <param name="keepOriginal">If set to <c>true</c> keep original gameobject hierarchy.</param>
-            public static GameObject[] CreateInstantiatedModelPrefab (GameObject [] unityGameObjectsToConvert, string directoryFullPath = null, bool keepOriginal = true)
+            public static GameObject[] CreateInstantiatedModelPrefab (
+                GameObject [] unityGameObjectsToConvert,
+                string directoryFullPath = null,
+                KeepOriginal keepOriginal = KeepOriginal.Default)
             {
                 if (directoryFullPath == null) {
                     directoryFullPath = FbxExporters.EditorTools.ExportSettings.GetAbsoluteSavePath();
@@ -119,7 +139,7 @@ public static GameObject Convert (
                 GameObject toConvert,
                 string directoryFullPath = null,
                 string fbxFullPath = null,
-                bool keepOriginal = true)
+                KeepOriginal keepOriginal = KeepOriginal.Default)
             {
                 if (string.IsNullOrEmpty(fbxFullPath)) {
                     // Generate a unique filename.
@@ -197,7 +217,20 @@ public static GameObject Convert (
                 unityGO = PrefabUtility.ConnectGameObjectToPrefab(unityGO, prefab);
 
                 // Remove (now redundant) gameobject
-                if (!keepOriginal) {
+                bool actuallyKeepOriginal;
+                switch(keepOriginal) {
+                case KeepOriginal.Delete:
+                    actuallyKeepOriginal = false;
+                    break;
+                case KeepOriginal.Keep:
+                    actuallyKeepOriginal = true;
+                    break;
+                case KeepOriginal.Default:
+                default:
+                    actuallyKeepOriginal = ExportSettings.keepOriginalAfterConvert;
+                    break;
+                }
+                if (!actuallyKeepOriginal) {
                     Object.DestroyImmediate (toConvert);
                 } else {
                     // rename and put under scene root in case we need to check values

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -125,6 +125,13 @@ public class ExportSettings : ScriptableSingleton<ExportSettings>
         public bool mayaCompatibleNames;
         public bool centerObjects;
 
+        /// <summary>
+        /// In Convert-to-model, by default we delete the original object.
+        /// This option lets you override that.
+        /// </summary>
+        [HideInInspector]
+        public bool keepOriginalAfterConvert;
+
         [SerializeField]
         public UnityEngine.Object turntableScene;
 
@@ -146,6 +153,7 @@ protected override void LoadDefaults()
             weldVertices = true;
             mayaCompatibleNames = true;
             centerObjects = true;
+            keepOriginalAfterConvert = false;
             convertToModelSavePath = kDefaultSavePath;
             turntableScene = null;
         }

Assets/FbxExporters/Editor/UnitTests/ConvertToModelTest.cs

@@ -132,9 +132,9 @@ public void BasicTest()
             // Create a cube.
             var cube = GameObject.CreatePrimitive(PrimitiveType.Cube);
 
-            // Convert it to a prefab.
+            // Convert it to a prefab -- but keep the cube.
             var cubePrefabInstance = ConvertToModel.Convert(cube,
-                directoryFullPath: path, keepOriginal: true);
+                directoryFullPath: path, keepOriginal: ConvertToModel.KeepOriginal.Keep);
 
             // Make sure it's what we expect.
             Assert.That(cube); // we kept the original
@@ -167,9 +167,20 @@ public void BasicTest()
             Assert.AreEqual(Path.GetFullPath(path), Path.GetDirectoryName(assetFullPath));
 
             // Convert it again, make sure there's only one FbxPrefab (see UNI-25528).
+            // Also make sure we deleted.
             var cubePrefabInstance2 = ConvertToModel.Convert(cubePrefabInstance,
-                    directoryFullPath: path, keepOriginal: false);
+                directoryFullPath: path, keepOriginal: ConvertToModel.KeepOriginal.Delete);
+            Assert.IsFalse(cubePrefabInstance);
             Assert.That(cubePrefabInstance2.GetComponents<FbxPrefab>().Length, Is.EqualTo(1));
+
+            // Create another cube, make sure the export settings drive whether we keep the cube or not.
+            var cubePrefabInstance3 = ConvertToModel.Convert(cube, directoryFullPath: path,
+                    keepOriginal: ConvertToModel.KeepOriginal.Default);
+            if (ConvertToModel.ExportSettings.keepOriginalAfterConvert) {
+                Assert.IsTrue(cube);
+            } else {
+                Assert.IsFalse(cube);
+            }
         }
     }
 }

Assets/FbxExporters/Editor/UnitTests/FbxPrefabTest.cs

@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using System.Collections.Generic;
 using System.Linq;
+using FbxExporters.Editor;
 
 namespace FbxExporters.UnitTests
 {
@@ -152,7 +153,7 @@ public void Init() {
 
             // Convert it to FBX. The asset file will be deleted automatically
             // on termination.
-            var fbxAsset = FbxExporters.Editor.ModelExporter.ExportObject(
+            var fbxAsset = ModelExporter.ExportObject(
                     GetRandomFbxFilePath(), m_original);
             m_source = AssetDatabase.LoadMainAssetAtPath(fbxAsset) as GameObject;
             m_originalHistory = Rep(m_source);
@@ -210,7 +211,7 @@ GameObject ModifySourceFbx()
             // enough, so the asset database knows to reload it. I was getting
             // test failures otherwise.
             SleepForFileTimestamp();
-            FbxExporters.Editor.ModelExporter.ExportObjects (
+            ModelExporter.ExportObjects (
                     AssetDatabase.GetAssetPath(m_source),
                     new Object[] { newModel } );
             AssetDatabase.Refresh();
@@ -291,7 +292,7 @@ public void BasicTest() {
             // Switch to some other model, which looks like the original model
             // (but is a totally different file). This will cause an update
             // immediately.
-            var fbxAsset = FbxExporters.Editor.ModelExporter.ExportObject(
+            var fbxAsset = ModelExporter.ExportObject(
                     GetRandomFbxFilePath(), m_original);
             var newSource = AssetDatabase.LoadMainAssetAtPath(fbxAsset) as GameObject;
             Assert.IsTrue(newSource);
@@ -351,13 +352,13 @@ public void TestCubeAtRoot()
             var cube = GameObject.CreatePrimitive(PrimitiveType.Cube);
             cube.name = "Cube";
             var cubeAssetPath = GetRandomFbxFilePath();
-            var autoPrefab = FbxExporters.Editor.ConvertToModel.Convert(cube,
+            var autoPrefab = ConvertToModel.Convert(cube,
                 fbxFullPath: cubeAssetPath);
             Assert.IsTrue(autoPrefab);
 
             // Make a maya locator.
             var locator = new GameObject("Cube");
-            var locatorAssetPath = FbxExporters.Editor.ModelExporter.ExportObject(
+            var locatorAssetPath = ModelExporter.ExportObject(
                 GetRandomFbxFilePath(), locator);
 
             // Check the prefab has all the default stuff it should have.
@@ -405,8 +406,9 @@ public void TestTransformAndReparenting()
             building3.transform.parent = building2.transform;
             building3.transform.localScale = new Vector3(.5f, .5f, .5f);
 
-            var original = FbxExporters.Editor.ConvertToModel.Convert (root,
-                               fbxFullPath: GetRandomFbxFilePath (), keepOriginal: true);
+            var original = ConvertToModel.Convert (root,
+                fbxFullPath: GetRandomFbxFilePath (),
+                keepOriginal: ConvertToModel.KeepOriginal.Keep);
 
             // Make sure it's OK.
             Assert.That (original.transform.GetChild (0).name, Is.EqualTo ("building2"));
@@ -417,7 +419,7 @@ public void TestTransformAndReparenting()
             // Modify the hierarchy, export to a new FBX, then copy the FBX under the prefab.
             root.SetActive(true);
             building2.name = "building2_renamed";
-            var newCopyPath = FbxExporters.Editor.ModelExporter.ExportObject(
+            var newCopyPath = ModelExporter.ExportObject(
                 GetRandomFbxFilePath(), root);
             SleepForFileTimestamp();
             System.IO.File.Copy(