Merge remote-tracking branch 'refs/remotes/origin/master' into UNI-21177-convert-default-selection-behavior

# Conflicts:
#	Assets/FbxExporters/Editor/ConvertToModel.cs

Author: vkovec

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -110,12 +110,9 @@ private static List<GameObject> OnConvertInPlace ()
                         {
                             GameObject unityGO = unityObj as GameObject;
 
-                            // configure name
-                            const string cloneSuffix = "(Clone)";
-
-                            if (unityGO.name.EndsWith (cloneSuffix, System.StringComparison.CurrentCulture)) {
-                                unityGO.name = unityGO.name.Remove (cloneSuffix.Length - 1);
-                            }
+                            // Set the name to be the name of the instantiated asset.
+                            // This will get rid of the "(Clone)" if it's added
+                            unityGO.name = unityMainAsset.name;
 
                             // configure transform and maintain local pose
                             unityGO.transform.SetParent (unityCommonAncestors[i], false);

README.md

@@ -20,6 +20,21 @@ export PROJECT_PATH=~/Development/FbxExporters
 export UNITY3D_PATH=/Applications/Unity\ 5.6.1f1/Unity.app/Contents/MacOS/Unity
 export PACKAGE_NAME=FbxExporters
 export PACKAGE_VERSION=0.0.3a
+export FBXSDK_PACKAGE_PATH=/path/to/FbxSdk.unitypackage
 
-"${UNITY3D_PATH}" -batchmode -projectPath "${PROJECT_PATH}" -exportPackage Assets/FbxExporters ${PROJECT_PATH}/${PACKAGE_NAME}_${PACKAGE_VERSION}.unitypackage -quit
+"${UNITY3D_PATH} -projectPath "${PROJECT_PATH}" -importPackage ${FBXSDK_PACKAGE_PATH} -quit
+"${UNITY3D_PATH}" -batchmode -projectPath "${PROJECT_PATH}" -exportPackage Assets/FbxExporters Assets/FbxSdk  ${PROJECT_PATH}/${PACKAGE_NAME}_${PACKAGE_VERSION}.unitypackage -quit
+```
+
+**On Windows**
+
+```
+set PROJECT_PATH=/path/to/FbxExporters
+set UNITY3D_PATH="C:/Program Files/Unity/Editor/Unity.exe"
+set PACKAGE_NAME=FbxExporters
+set PACKAGE_VERSION=0.0.3a
+set FBXSDK_PACKAGE_PATH=/path/to/FbxSdk.unitypackage
+
+%UNITY3D_PATH% -projectPath "%PROJECT_PATH%" -importPackage %FBXSDK_PACKAGE_PATH% -quit
+%UNITY3D_PATH% -batchmode -projectPath "%PROJECT_PATH%" -exportPackage Assets/FbxExporters Assets/FbxSdk %PROJECT_PATH%/%PACKAGE_NAME%_%PACKAGE_VERSION%.unitypackage -quit
 ```