set Unity project on import where applicable

Author: vkovec

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

@@ -61,7 +61,7 @@ private static string GetSceneFilePath ()
 
             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/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 = "{0}/Assets/{1}".format(projectPath, 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
@@ -149,6 +150,18 @@ 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)
+            splitPath = os.path.split(self._tempPath)
+            # Check that we are not at the root directory.
+            while len(splitPath) == 2 and splitPath[0] and os.path.dirname(splitPath[0]) != splitPath[0]:
+                if splitPath[1] == "Assets" and os.path.exists(splitPath[0]):
+                    # this is a valid Unity project, so set it
+                    maya.cmds.optionVar(sv=('UnityProject', splitPath[0]))
+                    break
+                splitPath = os.path.split(splitPath[0])
+                
         if self._tempName:
             self.storeAttribute(self._exportSet, self._unityFbxFileNameAttr, self._tempName)
 
@@ -218,7 +231,7 @@ def doIt(self, args):
 
         unityAppPath = maya.cmds.optionVar(q='UnityApp')
         unityProjectPath = maya.cmds.optionVar(q='UnityProject')
-        unityTempSavePath = maya.cmds.optionVar(q='UnityTempSavePath')
+        unityTempSavePath = "{0}/Assets/{1}".format(unityProjectPath, maya.cmds.optionVar(q='UnityTempSavePath'))
         unityCommand = "FbxExporters.Review.TurnTable.LastSavedModel"
 
         if not self.loadUnityFbxExportSettings():