Merge remote-tracking branch 'refs/remotes/origin/0.0.14a-austin-unite-release' into UNI-26990-nested-FbxPrefab-fix

Author: vkovec

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 ();
@@ -230,9 +219,6 @@ public static string kDefaultAdskRoot {
 
         public int selectedMayaApp = 0;
 
-        [SerializeField]
-        public UnityEngine.Object turntableScene;
-
         /// <summary>
         /// The path where Convert To Model will save the new fbx and prefab.
         ///
@@ -259,7 +245,6 @@ protected override void LoadDefaults()
             centerObjects = true;
             keepOriginalAfterConvert = false;
             convertToModelSavePath = kDefaultSavePath;
-            turntableScene = null;
             mayaOptionPaths = null;
             mayaOptionNames = null;
         }
@@ -444,20 +429,6 @@ public static string GetSelectedMayaPath()
             return instance.mayaOptionPaths [instance.selectedMayaApp];
         }
 
-        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

@@ -953,7 +953,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.
@@ -1566,7 +1565,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

Assets/FbxExporters/Editor/ReviewLastSavedModel.cs

@@ -196,7 +196,7 @@ public static void LastSavedModel ()
                 System.Collections.Generic.List<UnityEngine.SceneManagement.Scene> scenes
                       = new System.Collections.Generic.List<UnityEngine.SceneManagement.Scene> ();
 
-                string desiredSceneName = FbxExporters.EditorTools.ExportSettings.GetTurnTableSceneName ();
+                string desiredSceneName = "";//FbxExporters.EditorTools.ExportSettings.GetTurnTableSceneName ();
                 if (string.IsNullOrEmpty (desiredSceneName)) {
                     desiredSceneName = DefaultSceneName;
                 }
@@ -219,7 +219,7 @@ public static void LastSavedModel ()
                 // if turntable scene not added to list of scenes
                 if (!scene.IsValid () || !scene.isLoaded) 
                 {
-                    string scenePath = FbxExporters.EditorTools.ExportSettings.GetTurnTableScenePath ();
+                    string scenePath = "";//FbxExporters.EditorTools.ExportSettings.GetTurnTableScenePath ();
                     if (string.IsNullOrEmpty(scenePath)) {
                         // and if for some reason the turntable scene is missing create an empty scene
                         // NOTE: we cannot use NewScene because it will force me to save the modified Untitled scene

Assets/FbxExporters/Integrations/Autodesk/maya/scripts/install_maya_plugin.sh

@@ -26,15 +26,9 @@ if [ ! -d "${PROJECT_PATH}" ]; then
 fi
 echo "Using PROJECT_PATH=${PROJECT_PATH}"
 
-# Configure where unitypackage is located
-if [ ! -f "${PACKAGE_PATH}" ]; then
-    PACKAGE_PATH=`ls -t ${PROJECT_PATH}/FbxExporters_*.unitypackage | head -1`
-fi
-echo "Using PACKAGE_PATH=${PACKAGE_PATH}"
-
 # Configure where Maya is installed
 if [ ! -d "${MAYA_LOCATION}" ]; then
-    MAYA_LOCATION=/Applications/Autodesk/maya2017/Maya.app
+    MAYA_LOCATION=/Applications/Autodesk/maya2017/Maya.app/Contents
 fi
 echo "Using MAYA_LOCATION=${MAYA_LOCATION}"
 
@@ -43,26 +37,23 @@ if [ ! -f "${UNITY_EDITOR_PATH}" ]; then
     exit -1
 fi    
 
-# Install FbxExporters package
-"${UNITY_EDITOR_PATH}" -projectPath "${PROJECT_PATH}" -importPackage ${PACKAGE_PATH} -quit
-
 # Install Maya Integration
 "${UNITY_EDITOR_PATH}" -batchMode -projectPath "${PROJECT_PATH}" -executeMethod FbxExporters.Integrations.InstallMaya -quit
 
 # Configuring Maya2017 to auto-load integration
-MAYA_PATH=${MAYA_LOCATION}/Contents/bin/maya
+MAYA_PATH=${MAYA_LOCATION}/bin/maya
 
 if [ ! -f "${MAYA_PATH}" ]; then
     echo "Maya not installed at ${MAYA_PATH}"
 else
     # Configure Maya Integration
     TEMP_SAVE_PATH="_safe_to_delete"
-    EXPORT_SETTINGS_PATH="Integrations/Autodesk/maya/scripts/unityFbxExportSettings.mel"
+    EXPORT_SETTINGS_PATH="FbxExporters/Integrations/Autodesk/maya/scripts/unityFbxExportSettings.mel"
     MAYA_INSTRUCTION_PATH="_safe_to_delete/_temp.txt"
     HEADLESS=1
 
     # NOTE: we need start Maya in UI mode so that we can correctly configure the auto-load of the plugin.
     "${MAYA_PATH}" -command "configureUnityOneClick \"${PROJECT_PATH}\" \"${UNITY_EDITOR_PATH}\" \"${TEMP_SAVE_PATH}\" \"${EXPORT_SETTINGS_PATH}\" \"${MAYA_INSTRUCTION_PATH}\" ${HEADLESS}; scriptJob -idleEvent quit;"
 fi
 
-exit 0
+exit 0