Skip to content

Commit 5a3a9eb

Browse files
committed
code review fix - update labels and tooltips
1 parent 75ea7a0 commit 5a3a9eb

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

Packages/com.unity.formats.fbx/Editor/Scripts/ConvertToModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public static GameObject[] CreateInstantiatedModelPrefab (
8484
{
8585
var toExport = ModelExporter.RemoveRedundantObjects (unityGameObjectsToConvert);
8686

87-
if (!ExportSettings.instance.hideConvertToPrefabDialog)
87+
if (ExportSettings.instance.showConvertToPrefabDialog)
8888
{
8989
ConvertToPrefabEditorWindow.Init(toExport);
9090
return toExport.ToArray();

Packages/com.unity.formats.fbx/Editor/Scripts/ConvertToPrefabEditorWindow.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,10 @@ protected override void CreateCustomUI()
269269

270270
protected override void DontShowDialogUI()
271271
{
272-
ExportSettings.instance.hideConvertToPrefabDialog = EditorGUILayout.Toggle(
273-
new GUIContent("Don't Ask Me Again", "Last used Convert paths and options will be used"),
274-
ExportSettings.instance.hideConvertToPrefabDialog
272+
EditorGUI.indentLevel--;
273+
ExportSettings.instance.showConvertToPrefabDialog = !EditorGUILayout.Toggle(
274+
new GUIContent("Don't ask me again", "Don't ask me again, use the last used paths and options instead"),
275+
!ExportSettings.instance.showConvertToPrefabDialog
275276
);
276277
}
277278
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ public override void OnInspectorGUI() {
3838
exportSettings.autoUpdaterEnabled
3939
);
4040

41-
exportSettings.hideConvertToPrefabDialog = EditorGUILayout.Toggle(
42-
new GUIContent("Hide Convert Dialog:", "Hide the Convert Options dialog when converting to a linked prefab"),
43-
exportSettings.hideConvertToPrefabDialog
41+
exportSettings.showConvertToPrefabDialog = EditorGUILayout.Toggle(
42+
new GUIContent("Show Convert UI:", "Enable Convert dialog when converting to a Linked Prefab"),
43+
exportSettings.showConvertToPrefabDialog
4444
);
4545
EditorGUILayout.Space();
4646
EditorGUILayout.Space();
@@ -371,7 +371,7 @@ public static string[] DCCVendorLocations
371371
public bool launchAfterInstallation = true;
372372
public bool HideSendToUnityMenu = true;
373373
public bool BakeAnimation = true;
374-
public bool hideConvertToPrefabDialog = false;
374+
public bool showConvertToPrefabDialog = true;
375375

376376
public string IntegrationSavePath;
377377

@@ -425,7 +425,7 @@ public static string[] DCCVendorLocations
425425
protected override void LoadDefaults()
426426
{
427427
autoUpdaterEnabled = true;
428-
hideConvertToPrefabDialog = false;
428+
showConvertToPrefabDialog = true;
429429
launchAfterInstallation = true;
430430
HideSendToUnityMenu = true;
431431
prefabSavePaths = new List<string>(){ kDefaultSavePath };

0 commit comments

Comments
 (0)