Merge pull request #107 from Unity-Technologies/UNI-24169-hide-configure-button

Uni 24169 hide configure button + set project on import

Author: inwoods

Assets/FbxExporters/Editor/InstallIntegration.cs

@@ -248,17 +248,17 @@ public static string GetPackagePath()
 
         public static string GetTempSavePath()
         {
-            return System.IO.Path.Combine(Application.dataPath, FbxExporters.Review.TurnTable.TempSavePath).Replace("\\", "/");
+            return FbxExporters.Review.TurnTable.TempSavePath.Replace("\\", "/");
         }
 
         /// <summary>
         /// Gets the path to the export settings file.
-        /// Returns an absolute path with forward slashes as path separators.
+        /// Returns a relative path with forward slashes as path separators.
         /// </summary>
         /// <returns>The export settings path.</returns>
         public static string GetExportSettingsPath()
         {
-            return Application.dataPath + '/' + FBX_EXPORT_SETTINGS_PATH;
+            return FBX_EXPORT_SETTINGS_PATH;
         }
 
         public static string GetPackageVersion()

Assets/FbxExporters/Editor/ReviewLastSavedModel.cs

@@ -51,9 +51,14 @@ private static string GetSceneFilePath ()
                 return System.IO.Path.Combine (DefaultScenesPath, DefaultSceneName + ".unity");
             }
 
+            /// <summary>
+            /// Gets the last saved file path as a Unity-style (only forward slashes)
+            /// absolute path.
+            /// </summary>
+            /// <returns>The last saved file path.</returns>
             private static string GetLastSavedFilePath ()
             {
-                string modelPath = FbxExporters.Editor.Integrations.GetTempSavePath ();
+                string modelPath = Application.dataPath + "/" + TempSavePath;
                 System.IO.FileInfo fileInfo = GetLastSavedFile (modelPath);
 
                 return (fileInfo != null) ? fileInfo.FullName : null;

Assets/Integrations/Autodesk/maya2017/scripts/configureUnityOneClick.mel

@@ -8,9 +8,6 @@ global proc configureUnityOneClick(
     optionVar -stringValue "UnityTempSavePath" $unityTempSavePath;
     optionVar -stringValue "UnityFbxExportSettings" $unityFbxExportSettings;
     optionVar -intValue "UnityOneClick_Headless" $headless;
-    
-    // set project as the current workspace
-    workspace -o $unityProject;
 
     // configure auto load of plugin
     if (`pluginInfo -q -loaded unityOneClickPlugin` == false)

Assets/Integrations/Autodesk/maya2017/scripts/unityOneClick/commands.py

@@ -64,7 +64,8 @@ def loadUnityFbxExportSettings(self):
         """
         Load the Export Settings from file
         """
-        fileName = maya.cmds.optionVar(q="UnityFbxExportSettings")
+        projectPath = maya.cmds.optionVar(q="UnityProject")
+        fileName = os.path.join(projectPath,"Assets", maya.cmds.optionVar(q="UnityFbxExportSettings"))
         if not os.path.isfile(fileName):
             maya.cmds.error("Failed to find Unity Fbx Export Settings at: {0}".format(fileName))
             return False
@@ -146,6 +147,20 @@ def beforeImport(self, retCode, file, clientData):
     def afterImport(self, *args, **kwargs):
         if self._tempPath:
             self.storeAttribute(self._exportSet, self._unityFbxFilePathAttr, self._tempPath)
+            
+            # Change Unity project if fbx is from a different Unity project.
+            # Get the project based on the folder structure (i.e. folder above Assets)
+            head,tail = os.path.split(self._tempPath)
+            # Check that we are not at the root directory.
+            # os.path.dirname(head) returns the last directory name in the path, 
+            # or head if head is the root directory.
+            while head and os.path.dirname(head) != head:
+                if tail == "Assets":
+                    # this is a valid Unity project, so set it
+                    maya.cmds.optionVar(sv=('UnityProject', head))
+                    break
+                head,tail = os.path.split(head)
+                
         if self._tempName:
             self.storeAttribute(self._exportSet, self._unityFbxFileNameAttr, self._tempName)
 
@@ -161,6 +176,12 @@ def afterImport(self, *args, **kwargs):
 
     def doIt(self, args):
         self.loadDependencies()
+        
+        # set Unity project as the current workspace
+        currWorkspace = maya.cmds.workspace(o=True, q=True)
+        unityProject = maya.cmds.optionVar(q='UnityProject')
+        if unityProject:
+            maya.cmds.workspace(unityProject, o=True)
 
         self._tempPath = None
         self._tempName = None
@@ -175,6 +196,9 @@ def doIt(self, args):
 
         OpenMaya.MMessage.removeCallback(callbackId)
         OpenMaya.MMessage.removeCallback(callbackId2)
+        
+        if currWorkspace:
+            maya.cmds.workspace(currWorkspace, o=True)
 
     @classmethod
     def invoke(cls):
@@ -217,7 +241,7 @@ def doIt(self, args):
 
         unityAppPath = maya.cmds.optionVar(q='UnityApp')
         unityProjectPath = maya.cmds.optionVar(q='UnityProject')
-        unityTempSavePath = maya.cmds.optionVar(q='UnityTempSavePath')
+        unityTempSavePath = os.path.join(unityProjectPath, "Assets", maya.cmds.optionVar(q='UnityTempSavePath'))
         unityCommand = "FbxExporters.Review.TurnTable.LastSavedModel"
 
         if not self.loadUnityFbxExportSettings():
@@ -235,8 +259,10 @@ def doIt(self, args):
         # save fbx to Assets/_safe_to_delete/
         savePath = unityTempSavePath
         maya.cmds.sysFile(savePath, makeDir=True)
-        savePath = savePath + "/TurnTableModel.fbx"
-        maya.mel.eval(r'file -force -options "" -typ "FBX export" -pr -es "{0}"'.format(savePath));
+        savePath = os.path.join(savePath, "TurnTableModel.fbx")
+        savePath = os.path.abspath(savePath)
+        
+        maya.cmds.file(savePath, force=True, options="", typ="FBX export", pr=True, es=True)
 
         if maya.cmds.about(macOS=True):
             # Use 'open -a' to bring app to front if it has already been started.

Assets/Integrations/Autodesk/maya2017/scripts/unityOneClick/ui.py

@@ -59,7 +59,6 @@ def installMenu():
     maya.cmds.menuItem(parent=kMainWndMenuName, label=commands.importCmd.kShortLabel, command=commands.importCmd.kScriptCommand)        # @UndefinedVariable
     maya.cmds.menuItem(parent=kMainWndMenuName, label=commands.reviewCmd.kShortLabel, command=commands.reviewCmd.kScriptCommand)    # @UndefinedVariable
     maya.cmds.menuItem(parent=kMainWndMenuName, label=commands.publishCmd.kShortLabel, command=commands.publishCmd.kScriptCommand)    # @UndefinedVariable
-    maya.cmds.menuItem(parent=kMainWndMenuName, label=commands.configureCmd.kShortLabel, command=commands.configureCmd.kScriptCommand)        # @UndefinedVariable
 
 def uninstallMenu():
     """