Merge remote-tracking branch 'refs/remotes/origin/master' into UNI-29074-mayalt-plugin

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

Author: vkovec

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -10,9 +10,9 @@ namespace FbxExporters.EditorTools {
     [CustomEditor(typeof(ExportSettings))]
     public class ExportSettingsEditor : UnityEditor.Editor {
         Vector2 scrollPos = Vector2.zero;
-        const float LabelWidth = 225;
-        const float SelectableLabelMinWidth = 100;
-        const float BrowseButtonWidth = 55;
+        const float LabelWidth = 130;
+        const float SelectableLabelMinWidth = 90;
+        const float BrowseButtonWidth = 25;
 
         public override void OnInspectorGUI() {
             ExportSettings exportSettings = (ExportSettings)target;
@@ -27,9 +27,9 @@ public override void OnInspectorGUI() {
                 GUILayout.Label ("Version: " + version, EditorStyles.centeredGreyMiniLabel);
                 EditorGUILayout.Space ();
             }
-
+            GUILayout.BeginVertical();
             exportSettings.mayaCompatibleNames = EditorGUILayout.Toggle (
-                new GUIContent ("Convert to Maya Compatible Naming:",
+                new GUIContent ("Compatible Naming:",
                     "In Maya some symbols such as spaces and accents get replaced when importing an FBX " +
                     "(e.g. \"foo bar\" becomes \"fooFBXASC032bar\"). " +
                     "On export, convert the names of GameObjects so they are Maya compatible." +
@@ -48,7 +48,7 @@ public override void OnInspectorGUI() {
             GUILayout.BeginHorizontal ();
             GUILayout.Label (new GUIContent (
                 "Export Path:",
-                "Relative path for saving Model Prefabs."));
+                "Relative path for saving Model Prefabs."), GUILayout.Width(LabelWidth - 3));
 
             var pathLabel = ExportSettings.GetRelativeSavePath();
             if (pathLabel == ".") { pathLabel = "(Assets root)"; }
@@ -57,7 +57,7 @@ public override void OnInspectorGUI() {
                 GUILayout.MinWidth(SelectableLabelMinWidth),
                 GUILayout.Height(EditorGUIUtility.singleLineHeight));
 
-            if (GUILayout.Button ("Browse", EditorStyles.miniButton, GUILayout.Width (BrowseButtonWidth))) {
+            if (GUILayout.Button (new GUIContent("...", "Browse to a new location for saving model prefabs"), EditorStyles.miniButton, GUILayout.Width (BrowseButtonWidth))) {
                 string initialPath = ExportSettings.GetAbsoluteSavePath();
 
                 // if the directory doesn't exist, set it to the default save path
@@ -92,18 +92,13 @@ public override void OnInspectorGUI() {
             GUILayout.BeginHorizontal ();
             GUILayout.Label (new GUIContent (
                 "3D Application:",
-                "Select the 3D Application for which you would like to install the Unity integration."));
-
+                "Select the 3D Application for which you would like to install the Unity integration."), GUILayout.Width(LabelWidth - 3));
+            
             // dropdown to select Maya version to use
             var options = ExportSettings.GetDCCOptions();
-            // make sure we never initially have browse selected
-            if (exportSettings.selectedDCCApp == options.Length - 1) {
-                exportSettings.selectedDCCApp = exportSettings.GetPreferredDCCApp();
-            }
 
-            int oldValue = exportSettings.selectedDCCApp;
             exportSettings.selectedDCCApp = EditorGUILayout.Popup(exportSettings.selectedDCCApp, options);
-            if (exportSettings.selectedDCCApp == options.Length - 1) {
+            if (GUILayout.Button(new GUIContent("...", "Browse to a 3D application in a non-default location"), EditorStyles.miniButton, GUILayout.Width(BrowseButtonWidth))) {
                 var ext = "";
                 switch (Application.platform) {
                 case RuntimePlatform.WindowsEditor:
@@ -128,14 +123,11 @@ public override void OnInspectorGUI() {
                     }
                     if (foundDCCPath == null) {
                         Debug.LogError (string.Format ("Could not find supported 3D application at: \"{0}\"", Path.GetDirectoryName (dccPath)));
-                        exportSettings.selectedDCCApp = oldValue;
                     } else {
                         dccPath = foundDCCPath;
                         ExportSettings.AddDCCOption (dccPath, foundDCC);
                     }
                     Repaint ();
-                } else {
-                    exportSettings.selectedDCCApp = oldValue;
                 }
             }
             GUILayout.EndHorizontal ();
@@ -147,8 +139,15 @@ public override void OnInspectorGUI() {
                 FbxExporters.Editor.IntegrationsUI.InstallDCCIntegration ();
             }
 
+            exportSettings.launchAfterInstallation = EditorGUILayout.Toggle(
+                new GUIContent("Launch 3D Application:",
+                    "Launch the selected application after unity integration is completed."),
+                exportSettings.launchAfterInstallation
+            );
+
             GUILayout.FlexibleSpace ();
             GUILayout.EndScrollView ();
+            GUILayout.EndVertical();
 
             if (GUI.changed) {
                 EditorUtility.SetDirty (exportSettings);
@@ -232,6 +231,7 @@ public static string kDefaultAdskRoot {
         // Note: default values are set in LoadDefaults().
         public bool mayaCompatibleNames;
         public bool centerObjects;
+        public bool launchAfterInstallation;
 
         public int selectedDCCApp = 0;
 
@@ -259,6 +259,7 @@ protected override void LoadDefaults()
         {
             mayaCompatibleNames = true;
             centerObjects = true;
+            launchAfterInstallation = true;
             convertToModelSavePath = kDefaultSavePath;
             dccOptionPaths = null;
             dccOptionNames = null;
@@ -530,19 +531,17 @@ public static GUIContent[] GetDCCOptions(){
 
             if (instance.dccOptionPaths.Count <= 0) {
                 return new GUIContent[]{
-                    new GUIContent("<No 3D Application found>"),
-                    new GUIContent("Browse...")
+                    new GUIContent("<No 3D Application found>")
                 };
             }
 
-            GUIContent[] optionArray = new GUIContent[instance.dccOptionPaths.Count+1];
+            GUIContent[] optionArray = new GUIContent[instance.dccOptionPaths.Count];
             for(int i = 0; i < instance.dccOptionPaths.Count; i++){
                 optionArray [i] = new GUIContent(
                     instance.dccOptionNames[i],
                     instance.dccOptionPaths[i]
                 );
             }
-            optionArray [optionArray.Length - 1] = new GUIContent("Browse...");
 
             return optionArray;
         }

Assets/FbxExporters/Editor/InstallIntegration.cs

@@ -63,6 +63,22 @@ public static string GetProjectPath()
         /// <returns><c>true</c> if folder is already unzipped at the specified path; otherwise, <c>false</c>.</returns>
         /// <param name="path">Path.</param>
         public abstract bool FolderAlreadyUnzippedAtPath (string path);
+
+        /// <summary>
+        /// Launches application at given path
+        /// </summary>
+        /// <param name="AppPath"></param>
+        public static void LaunchDCCApplication(string AppPath)
+        {
+            System.Diagnostics.Process myProcess = new System.Diagnostics.Process();
+            myProcess.StartInfo.FileName = AppPath;
+            myProcess.StartInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Normal;
+            myProcess.StartInfo.CreateNoWindow = false;
+            myProcess.StartInfo.UseShellExecute = false;
+
+            myProcess.EnableRaisingEvents = false;
+            myProcess.Start();
+        }
     }
 
 
@@ -122,10 +138,14 @@ protected static string ESCAPED_QUOTE {
             }
         }
 
-        protected virtual string MAYA_COMMANDS { get {
-                return string.Format("configureUnityFbxForMaya {0}{1}{0} {0}{2}{0} {0}{3}{0} {0}{4}{0} {0}{5}{0} {6}; scriptJob -idleEvent quit;",
+        protected virtual string MAYA_CONFIG_COMMAND { get {
+                return string.Format("configureUnityFbxForMaya {0}{1}{0} {0}{2}{0} {0}{3}{0} {0}{4}{0} {0}{5}{0} {6};",
                     ESCAPED_QUOTE, GetProjectPath(), GetAppPath(), GetTempSavePath(),
-                    GetExportSettingsPath(), GetMayaInstructionPath(), (IsHeadlessInstall()?1:0));
+                    GetExportSettingsPath(), GetMayaInstructionPath(), (IsHeadlessInstall() ? 1 : 0));
+        }}
+
+        private static string MAYA_CLOSE_COMMAND { get {
+                return string.Format("scriptJob -idleEvent quit;");
         }}
         private static Char[] FIELD_SEPARATORS = new Char[] {':'};
 
@@ -332,24 +352,45 @@ public int ConfigureMaya(string mayaPath)
                 myProcess.StartInfo.CreateNoWindow = true;
                 myProcess.StartInfo.UseShellExecute = false;
 
+                string commandString;
+
                 switch (Application.platform) {
                 case RuntimePlatform.WindowsEditor:
-                    myProcess.StartInfo.Arguments = string.Format("-command \"{0}\"", MAYA_COMMANDS);
+                    commandString = "-command \"{0}\"";
                     break;
                 case RuntimePlatform.OSXEditor:
-                    myProcess.StartInfo.Arguments = string.Format(@"-command '{0}'", MAYA_COMMANDS);
+                    commandString = @"-command '{0}'";
                     break;
                 default:
                     throw new NotImplementedException ();
                 }
 
+                if (EditorTools.ExportSettings.instance.launchAfterInstallation)
+                {
+                    myProcess.StartInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Normal;
+                    myProcess.StartInfo.CreateNoWindow = false;
+                    myProcess.StartInfo.Arguments = string.Format(commandString, MAYA_CONFIG_COMMAND);
+                }
+                else
+                {
+                    myProcess.StartInfo.Arguments = string.Format(commandString, MAYA_CONFIG_COMMAND + MAYA_CLOSE_COMMAND);
+                }
+
                 myProcess.EnableRaisingEvents = true;
                 myProcess.Start();
-                myProcess.WaitForExit();
-                ExitCode = myProcess.ExitCode;
-                Debug.Log(string.Format("Ran maya: [{0}]\nWith args [{1}]\nResult {2}",
-                            mayaPath, myProcess.StartInfo.Arguments, ExitCode));
-             }
+
+                if (!EditorTools.ExportSettings.instance.launchAfterInstallation)
+                {
+                    myProcess.WaitForExit();
+                    ExitCode = myProcess.ExitCode;
+                    Debug.Log(string.Format("Ran maya: [{0}]\nWith args [{1}]\nResult {2}",
+                                mayaPath, myProcess.StartInfo.Arguments, ExitCode));
+                }
+                else
+                {
+                    ExitCode = 0;
+                }
+            }
              catch (Exception e)
              {
                 UnityEngine.Debug.LogError(string.Format ("Exception failed to start Maya ({0})", e.Message));
@@ -652,8 +693,13 @@ public static int InstallMaxPlugin(string maxExe){
                 myProcess.WaitForExit();
                 ExitCode = myProcess.ExitCode;
 
+                if (EditorTools.ExportSettings.instance.launchAfterInstallation)
+                {
+                    LaunchDCCApplication(maxExe);
+                }
+
                 // TODO (UNI-29910): figure out what exactly causes this exit code + how to resolve
-                if(ExitCode == -1073740791){
+                if (ExitCode == -1073740791){
                     Debug.Log(string.Format("Detected 3ds max exitcode {0} -- safe to ignore", ExitCode));
                     ExitCode = 0;
                 }
@@ -665,7 +711,7 @@ public static int InstallMaxPlugin(string maxExe){
             {
                 UnityEngine.Debug.LogError(string.Format ("Exception failed to start Max ({0})", e.Message));
                 ExitCode = -1;
-            }
+            }            
             return ExitCode;
         }
 

Assets/FbxExporters/FBX_Exporter_User_Guide_v1.1.0b1.pdf

@@ -1,5 +1,5 @@
 -- MacroScripts that will perform actions
-macroScript UnityImport category:"Unity"
+macroScript UnityImport category:"Unity" tooltip:"Import FBX file from Unity project and auto-configure for exporting."
 (
     origObjects = #()
 
@@ -82,7 +82,7 @@ macroScript UnityImport category:"Unity"
         callbacks.removeScripts #postImport id:#unityPlugin
     )
 )
-macroScript UnityExport category:"Unity"
+macroScript UnityExport category:"Unity" tooltip:"Export a model to Unity"
 (
     fn unitToScaleFactor unit = (
         case unit of (

Assets/Integrations/Autodesk/max/scripts/UnityFbxForMaxPlugin.ms

@@ -23,7 +23,7 @@ endif()
 message(STATUS "Building for ${CMAKE_BUILD_TYPE}")
 
 if (NOT DEFINED PACKAGE_VERSION OR "${PACKAGE_VERSION}" STREQUAL "")
-    set(PACKAGE_VERSION "sprint32")
+    set(PACKAGE_VERSION "1.1.0b1")
 endif()
 message(STATUS "Using Package Version: ${PACKAGE_VERSION}")
 

CMakeLists.txt

@@ -1,5 +1,20 @@
 RELEASE NOTES
 
+**Version**: 1.1.0b1
+
+NEW FEATURES
+
+* Export Settings: Set application with latest version as default selection in 3D application dropdown
+
+In case of a tie, use the following preference order: Maya > Maya LT > 3ds Max > Blender.
+
+* Updated user documentation
+
+FIXES
+
+* Exporter: Fix FBX exported from Unity causing crash when imported in 3ds Max.
+* Export Settings: Fix hang when adding multiple installations of the same version of a 3D application to the dropdown
+
 **Version**: sprint32
 
 NEW FEATURES