Merge remote-tracking branch 'refs/remotes/origin/master' into UNI-27977-generalize-DCC-app-selection

# Conflicts:
#	Assets/FbxExporters/Editor/FbxExportSettings.cs
#	Assets/FbxExporters/Editor/InstallIntegration.cs
#	CMakeLists.txt

Author: vkovec

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -199,23 +199,21 @@ public static GameObject Convert (
                     Object.DestroyImmediate(fbxPrefab);
                 }
                 fbxPrefab = unityGO.AddComponent<FbxPrefab>();
-                fbxPrefab.SetSourceModel(unityMainAsset);
+                var fbxPrefabUtility = new FbxPrefabAutoUpdater.FbxPrefabUtility (fbxPrefab);
+                fbxPrefabUtility.SetSourceModel(unityMainAsset);
 
                 // Disconnect from the FBX file.
                 PrefabUtility.DisconnectPrefabInstance(unityGO);
 
                 // Create a prefab from the instantiated and componentized unityGO.
                 var prefabFileName = Path.ChangeExtension(projectRelativePath, ".prefab");
-                var prefab = PrefabUtility.CreatePrefab(prefabFileName, unityGO);
+                var prefab = PrefabUtility.CreatePrefab(prefabFileName, unityGO, ReplacePrefabOptions.ConnectToPrefab);
                 if (!prefab) {
                     throw new System.Exception(
                         string.Format("Failed to create prefab asset in [{0}] from fbx [{1}]",
                             prefabFileName, fbxFullPath));
                 }
 
-                // Connect to the prefab file.
-                unityGO = PrefabUtility.ConnectGameObjectToPrefab(unityGO, prefab);
-
                 // Remove (now redundant) gameobject
                 bool actuallyKeepOriginal;
                 switch(keepOriginal) {
@@ -399,6 +397,10 @@ public static void CopyComponents(GameObject from, GameObject to){
                     }
 
                     var json = EditorJsonUtility.ToJson(component);
+                    if (string.IsNullOrEmpty (json)) {
+                        // this happens for missing scripts
+                        continue;
+                    }
 
                     System.Type expectedType = component.GetType();
                     Component toComponent = null;
@@ -417,7 +419,9 @@ public static void CopyComponents(GameObject from, GameObject to){
                     if (!toComponent) {
                         // It doesn't exist => create and copy.
                         toComponent = to.AddComponent(component.GetType());
-                        EditorJsonUtility.FromJsonOverwrite(json, toComponent);
+                        if (toComponent) {
+                            EditorJsonUtility.FromJsonOverwrite (json, toComponent);
+                        }
                     } else {
                         // It exists => copy.
                         // But we want to override that behaviour in a few

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -85,17 +85,6 @@ public override void OnInspectorGUI() {
                     }
                 }
             }
-            GUILayout.EndHorizontal ();
-            GUILayout.BeginHorizontal ();
-
-            GUILayout.Label (new GUIContent (
-                "Turntable Scene:",
-                "Scene to use for reviewing models. If none, a scene will be created on review."));
-            
-            exportSettings.turntableScene = EditorGUILayout.ObjectField (
-                exportSettings.turntableScene, typeof(SceneAsset), false
-            );
-
             GUILayout.EndHorizontal ();
 
             EditorGUILayout.Space ();
@@ -130,6 +119,13 @@ public override void OnInspectorGUI() {
 
                 // check that the path is valid and references the maya executable
                 if (!string.IsNullOrEmpty (dccPath)) {
+                    var md = Directory.GetParent (dccPath);
+                    if (md.Parent.Name.ToLower ().StartsWith ("mayalt")) {
+                        Debug.LogError (string.Format("Unity Integration does not support Maya LT: \"{0}\"", md.FullName));
+                        exportSettings.selectedDCCApp = oldValue;
+                        return;
+                    }
+
                     ExportSettings.DCCType foundDCC = ExportSettings.DCCType.Maya;
                     var foundDCCPath = TryFindDCC (dccPath, ext, ExportSettings.DCCType.Maya);
                     if (foundDCCPath == null && Application.platform == RuntimePlatform.WindowsEditor) {
@@ -138,6 +134,8 @@ public override void OnInspectorGUI() {
                         } else {
                             foundDCCPath = TryFindDCC (dccPath, ext, ExportSettings.DCCType.Max);
                             foundDCC = ExportSettings.DCCType.Max;
+                    }
+
                         }
                     }
                     if (foundDCCPath == null) {
@@ -224,15 +222,18 @@ public class ExportSettings : ScriptableSingleton<ExportSettings>
         /// The path where all the different versions of Maya are installed
         /// by default. Depends on the platform.
         /// </summary>
-        public const string kDefaultAdskRoot =
-#if UNITY_EDITOR_OSX
-            "/Applications/Autodesk"
-#elif UNITY_EDITOR_LINUX
-            "/usr/autodesk"
-#else // WINDOWS
-            "C:/Program Files/Autodesk"
-#endif
-            ;
+        public static string kDefaultAdskRoot {
+            get{
+                switch (Application.platform) {
+                case RuntimePlatform.WindowsEditor:
+                    return "C:/Program Files/Autodesk";
+                case RuntimePlatform.OSXEditor:
+                    return "/Applications/Autodesk";
+                default:
+                    throw new NotImplementedException ();
+                }
+            }
+        }
 
         // Note: default values are set in LoadDefaults().
         public bool mayaCompatibleNames;
@@ -247,9 +248,6 @@ public class ExportSettings : ScriptableSingleton<ExportSettings>
 
         public int selectedDCCApp = 0;
 
-        [SerializeField]
-        public UnityEngine.Object turntableScene;
-
         /// <summary>
         /// The path where Convert To Model will save the new fbx and prefab.
         ///
@@ -276,7 +274,6 @@ protected override void LoadDefaults()
             centerObjects = true;
             keepOriginalAfterConvert = false;
             convertToModelSavePath = kDefaultSavePath;
-            turntableScene = null;
             dccOptionPaths = null;
             dccOptionNames = null;
         }
@@ -371,23 +368,24 @@ private static void FindDCCInstalls() {
         /// <param name="location">Location of Maya install.</param>
         private static string GetMayaExePath(string location)
         {
-#if UNITY_EDITOR_OSX
-            // MAYA_LOCATION on mac is set by Autodesk to be the
-            // Contents directory. But let's make it easier on people
-            // and allow just having it be the app bundle or a
-            // directory that holds the app bundle.
-            if (location.EndsWith(".app/Contents")) {
-            return location + "/MacOS/Maya";
-            } else if (location.EndsWith(".app")) {
-            return location + "/Contents/MacOS/Maya";
-            } else {
-            return location + "/Maya.app/Contents/MacOS/Maya";
+            switch (Application.platform) {
+            case RuntimePlatform.WindowsEditor:
+                return location + "/bin/maya.exe";
+            case RuntimePlatform.OSXEditor:
+                // MAYA_LOCATION on mac is set by Autodesk to be the
+                // Contents directory. But let's make it easier on people
+                // and allow just having it be the app bundle or a
+                // directory that holds the app bundle.
+                if (location.EndsWith(".app/Contents")) {
+                    return location + "/MacOS/Maya";
+                } else if (location.EndsWith(".app")) {
+                    return location + "/Contents/MacOS/Maya";
+                } else {
+                    return location + "/Maya.app/Contents/MacOS/Maya";
+                }
+            default:
+                throw new NotImplementedException ();
             }
-#elif UNITY_EDITOR_LINUX
-            return location + "/bin/maya";
-#else // WINDOWS
-            return location + "/bin/maya.exe";
-#endif
         }
 
         public static GUIContent[] GetDCCOptions(){
@@ -515,20 +513,6 @@ public static string GetSelectedDCCPath()
             return instance.dccOptionPaths [instance.selectedDCCApp];
         }
 
-        public static string GetTurnTableSceneName(){
-            if (instance.turntableScene) {
-                return instance.turntableScene.name;
-            }
-            return null;
-        }
-
-        public static string GetTurnTableScenePath(){
-            if (instance.turntableScene) {
-                return AssetDatabase.GetAssetPath (instance.turntableScene);
-            }
-            return null;
-        }
-
         /// <summary>
         /// The path where Convert To Model will save the new fbx and prefab.
         /// This is relative to the Application.dataPath ; it uses '/' as the

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -52,6 +52,8 @@ public class ModelExporter : System.IDisposable
 
             const int UnitScaleFactor = 100;
 
+            public const string PACKAGE_UI_NAME = "FBX Exporter";
+
             /// <summary>
             /// Create instance of exporter.
             /// </summary>
@@ -953,7 +955,6 @@ public enum TransformExportType { Local, Global, Reset };
             public int ExportAll (IEnumerable<UnityEngine.Object> unityExportSet)
             {
                 exportCancelled = false;
-                Verbose = true;
 
                 // Export first to a temporary file
                 // in case the export is cancelled.
@@ -1006,7 +1007,7 @@ public int ExportAll (IEnumerable<UnityEngine.Object> unityExportSet)
                         fbxSceneInfo.mRevision = "1.0";
                         fbxSceneInfo.mKeywords = Keywords;
                         fbxSceneInfo.mComment = Comments;
-                        fbxSceneInfo.Original_ApplicationName.Set("Unity FbxExporter Plugin");
+                        fbxSceneInfo.Original_ApplicationName.Set(string.Format("Unity {0}", PACKAGE_UI_NAME));
                         // set last saved to be the same as original, as this is a new file.
                         fbxSceneInfo.LastSaved_ApplicationName.Set(fbxSceneInfo.Original_ApplicationName.Get());
 
@@ -1181,7 +1182,7 @@ public static bool OnValidateMenuItem ()
             public static void DisplayNoSelectionDialog()
             {
                 UnityEditor.EditorUtility.DisplayDialog (
-                    "Fbx Exporter Warning", 
+                    string.Format("{0} Warning", PACKAGE_UI_NAME), 
                     "No GameObjects selected for export.", 
                     "Ok");
             }
@@ -1566,7 +1567,7 @@ public void Dispose ()
             {
             }
 
-            public bool Verbose { private set; get; }
+            public bool Verbose { private set {;} get { return Debug.unityLogger.logEnabled; } }
 
             /// <summary>
             /// manage the selection of a filename