Merge remote-tracking branch 'refs/remotes/origin/master' into UNI-24169-hide-configure-button

Author: vkovec

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -98,6 +98,13 @@ public override void OnInspectorGUI() {
             );
 
             GUILayout.EndHorizontal ();
+
+            EditorGUILayout.Space ();
+            if (GUILayout.Button (new GUIContent ("Auto Review",
+                "Opens turntable review of last saved prefab."))) {
+                FbxExporters.Review.TurnTable.LastSavedModel ();
+            }
+
             GUILayout.FlexibleSpace ();
             GUILayout.EndScrollView ();
 

Assets/FbxExporters/Editor/InstallIntegration.cs

@@ -185,11 +185,11 @@ private static string MAYA_COMMANDS { get {
         private const string MODULE_TEMPLATE_PATH = "Integrations/Autodesk/maya"+VERSION_TAG+"/" + MODULE_FILENAME + ".txt";
 
 #if UNITY_EDITOR_OSX
-        private const string MAYA_MODULES_PATH = "Library/Preferences/Autodesk/Maya/"+VERSION_TAG+"/modules";
+        private const string MAYA_MODULES_PATH = "Library/Preferences/Autodesk/Maya/modules";
 #elif UNITY_EDITOR_LINUX
-        private const string MAYA_MODULES_PATH = "Maya/"+VERSION_TAG+"/modules";
+        private const string MAYA_MODULES_PATH = "Maya/modules";
 #else
-        private const string MAYA_MODULES_PATH = "maya/"+VERSION_TAG+"/modules";
+        private const string MAYA_MODULES_PATH = "maya/modules";
 #endif
 
         private static string GetUserFolder()

Assets/FbxExporters/Editor/ReviewLastSavedModel.cs

@@ -14,8 +14,6 @@ namespace Review
         [UnityEditor.InitializeOnLoad]
         public class TurnTable
         {
-            const string MenuItemName = "FbxExporters/Turntable Review/Autoload Last Saved Prefab";
-
             const string DefaultScenesPath = "Assets";
             const string DefaultSceneName = "FbxExporters_TurnTableReview";
 
@@ -26,12 +24,6 @@ public class TurnTable
             static string LastFilePath = null;
             static Object LastModel = null;
 
-            [UnityEditor.MenuItem (MenuItemName, false, 10)]
-            public static void OnMenu ()
-            {
-                LastSavedModel ();
-            }
-
             private static System.IO.FileInfo GetLastSavedFile (string directoryPath, string ext = ".fbx")
             {
                 System.IO.DirectoryInfo directoryInfo = new System.IO.DirectoryInfo (directoryPath);

Assets/FbxExporters/Editor/UnitTests/FbxExportSettingsTest.cs

@@ -165,7 +165,7 @@ public void TestGetSetFields()
                     Path.DirectorySeparatorChar);
 
             var defaultAbsolutePath = ExportSettings.GetAbsoluteSavePath();
-            var dataPath = Path.Combine(appDataPath, ExportSettings.kDefaultSavePath);
+            var dataPath = Path.GetFullPath(Path.Combine(appDataPath, ExportSettings.kDefaultSavePath));
             Assert.AreEqual(dataPath, defaultAbsolutePath);
 
             // set; check that the saved value is platform-independent,

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

@@ -8,6 +8,9 @@ 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)