Merge remote-tracking branch 'refs/remotes/origin/0.0.14a-austin-unite-release' into UNI-27141-rename-maya-plugin

Author: vkovec

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -52,6 +52,8 @@ public class ModelExporter : System.IDisposable
 
             const int UnitScaleFactor = 100;
 
+            public const string PACKAGE_UI_NAME = "FBX Exporter";
+
             /// <summary>
             /// Create instance of exporter.
             /// </summary>
@@ -1005,7 +1007,7 @@ public int ExportAll (IEnumerable<UnityEngine.Object> unityExportSet)
                         fbxSceneInfo.mRevision = "1.0";
                         fbxSceneInfo.mKeywords = Keywords;
                         fbxSceneInfo.mComment = Comments;
-                        fbxSceneInfo.Original_ApplicationName.Set("Unity FbxExporter Plugin");
+                        fbxSceneInfo.Original_ApplicationName.Set(string.Format("Unity {0}", PACKAGE_UI_NAME));
                         // set last saved to be the same as original, as this is a new file.
                         fbxSceneInfo.LastSaved_ApplicationName.Set(fbxSceneInfo.Original_ApplicationName.Get());
 
@@ -1180,7 +1182,7 @@ public static bool OnValidateMenuItem ()
             public static void DisplayNoSelectionDialog()
             {
                 UnityEditor.EditorUtility.DisplayDialog (
-                    "Fbx Exporter Warning", 
+                    string.Format("{0} Warning", PACKAGE_UI_NAME), 
                     "No GameObjects selected for export.", 
                     "Ok");
             }

Assets/FbxExporters/Editor/FbxPrefabAutoUpdater.cs

@@ -39,7 +39,7 @@ public static string FindFbxPrefabAssetPath()
                     return path;
                 }
             }
-            Debug.LogError("FbxPrefab.cs not found; are you trying to uninstall FbxExporters?");
+            Debug.LogError(string.Format("{0} not found; are you trying to uninstall {1}?", FBX_PREFAB_FILE.Substring(1), FbxExporters.Editor.ModelExporter.PACKAGE_UI_NAME));
             return "";
         }
 

Assets/FbxExporters/README.txt

@@ -1,4 +1,4 @@
-FbxExporters Package
+FbxExporter Package
 ====================
 
 Copyright (c) 2017 Unity Technologies. All rights reserved.

CMakeLists.txt

@@ -23,12 +23,12 @@ endif()
 message(STATUS "Building for ${CMAKE_BUILD_TYPE}")
 
 if (NOT DEFINED PACKAGE_VERSION OR "${PACKAGE_VERSION}" STREQUAL "")
-    set(PACKAGE_VERSION "1.0")
+    set(PACKAGE_VERSION "1.0.0f1")
 endif()
 message(STATUS "Using Package Version: ${PACKAGE_VERSION}")
 
 if (NOT DEFINED PACKAGE_PATH OR "${PACKAGE_PATH}" STREQUAL "")
-    set(PACKAGE_PATH "${CMAKE_BINARY_DIR}/FbxExporters_${PACKAGE_VERSION}.unitypackage")
+    set(PACKAGE_PATH "${CMAKE_BINARY_DIR}/FbxExporter_${PACKAGE_VERSION}.unitypackage")
 endif()
 message(STATUS "Creating Exporter Package at: ${PACKAGE_PATH}")
 
@@ -205,7 +205,8 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release")
             PATTERN "Editor/EditorRotate.cs" EXCLUDE
             PATTERN "Editor/FbxPrefabAutoUpdater.cs" EXCLUDE
             PATTERN "Editor/ConvertToModel.cs" EXCLUDE
-            PATTERN "Editor/FbxPrefabInspector.cs" EXCLUDE)
+            PATTERN "Editor/FbxPrefabInspector.cs" EXCLUDE
+            PATTERN "Integrations/BringToFront.exe" EXCLUDE)
     install(FILES ${CLASS_LIBRARY_DEST}/${EDITOR_CLASS_LIBRARY_NAME} DESTINATION FbxExporters/Editor)
     install(FILES ${CLASS_LIBRARY_DEST}/${RUNTIME_CLASS_LIBRARY_NAME} DESTINATION FbxExporters)
 else()