Merge pull request #472 from Unity-Technologies/convert-to-prefab-variant-UI-fixes

Convert to prefab variant UI fixes

Author: vkovec

com.unity.formats.fbx/Editor/ConvertToNestedPrefab.cs

@@ -34,10 +34,10 @@ protected ConvertToNestedPrefabException(SerializationInfo info, StreamingContex
 
     internal static class ConvertToNestedPrefab
     {
-        const string GameObjectMenuItemName = "GameObject/Convert To Model Prefab Variant Instance...";
-        const string AssetsMenuItemName = "Assets/Convert To Model Prefab Variant...";
-        const string UndoConversionGroup = "Convert {0} to Model Prefab Variant";
-        internal const string UndoConversionCreateObject = "Convert to Model Prefab Variant instance";
+        const string GameObjectMenuItemName = "GameObject/Convert To FBX Linked Prefab...";
+        const string AssetsMenuItemName = "Assets/Convert To FBX Linked Prefab...";
+        const string UndoConversionGroup = "Convert {0} to FBX Linked Prefab";
+        internal const string UndoConversionCreateObject = "Convert to FBX Linked Prefab";
 
         /// <summary>
         /// OnContextItem is called either:

com.unity.formats.fbx/Editor/ExportModelEditorWindow.cs

@@ -446,6 +446,7 @@ protected void OnGUI ()
                 }
             }
             GUILayout.EndHorizontal ();
+            EditorGUILayout.Space(); // adding a space at bottom of dialog so buttons aren't right at the edge
 
             if (GUI.changed) {
                 SaveExportSettings ();

com.unity.formats.fbx/Editor/FbxExportSettings.cs

@@ -71,7 +71,7 @@ public override void OnInspectorGUI() {
             EditorGUILayout.LabelField("Export Options", EditorStyles.boldLabel);
             EditorGUI.indentLevel++;
             exportSettings.ShowConvertToPrefabDialog = EditorGUILayout.Toggle(
-                new GUIContent("Show Convert UI:", "Enable Convert dialog when converting to a Linked Prefab"),
+                new GUIContent("Show Convert UI:", "Show the Convert dialog when converting to an FBX Linked Prefab"),
                 exportSettings.ShowConvertToPrefabDialog
             );
             EditorGUILayout.Space();