Skip to content

Commit f18dae6

Browse files
author
AJubrey
committed
[CHANGED] naming of variable in c#
[CHANGED] setupui mel file so that it would work with mac
1 parent 76f0b19 commit f18dae6

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

Assets/FbxExporters/Editor/FbxExportSettings.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,10 @@ public override void OnInspectorGUI() {
196196
exportSettings.launchAfterInstallation
197197
);
198198

199-
exportSettings.HideOtherMenuMaya = EditorGUILayout.Toggle(
199+
exportSettings.HideSendToUnityMenu = EditorGUILayout.Toggle(
200200
new GUIContent("Hide 'SendToUnity' menu (Maya only):",
201201
"Hide the GamePipeline menu in Maya, can help avoid confusion with Fbx export menu (will only affect maya integration)"),
202-
exportSettings.HideOtherMenuMaya
202+
exportSettings.HideSendToUnityMenu
203203
);
204204

205205
GUILayout.FlexibleSpace ();
@@ -308,10 +308,9 @@ public static string[] DCCVendorLocations {
308308
public bool mayaCompatibleNames;
309309
public bool centerObjects;
310310
public bool launchAfterInstallation;
311-
public bool HideOtherMenuMaya;
311+
public bool HideSendToUnityMenu;
312312
public int ExportFormatSelection;
313313

314-
315314
public string IntegrationSavePath;
316315

317316
public int selectedDCCApp = 0;
@@ -341,7 +340,7 @@ protected override void LoadDefaults()
341340
mayaCompatibleNames = true;
342341
centerObjects = true;
343342
launchAfterInstallation = true;
344-
HideOtherMenuMaya = true;
343+
HideSendToUnityMenu = true;
345344
ExportFormatSelection = 0;
346345
convertToModelSavePath = kDefaultSavePath;
347346
IntegrationSavePath = Directory.GetCurrentDirectory().ToString();

Assets/FbxExporters/Editor/InstallIntegration.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ protected static string ESCAPED_QUOTE {
156156

157157
protected string MAYA_CONFIG_COMMAND { get {
158158
return string.Format("unityConfigure {0}{1}{0} {0}{2}{0} {0}{3}{0} {4} {5};",
159-
ESCAPED_QUOTE, GetProjectPath(), GetExportSettingsPath(), GetImportSettingsPath(), (IsHeadlessInstall()?1:0), (HideOtherMenuMaya()?1:0));
159+
ESCAPED_QUOTE, GetProjectPath(), GetExportSettingsPath(), GetImportSettingsPath(), (IsHeadlessInstall()?1:0), (HideSendToUnityMenu()?1:0));
160160
}}
161161

162162
private string MAYA_CLOSE_COMMAND { get {
@@ -181,9 +181,9 @@ public static bool IsHeadlessInstall ()
181181
return false;
182182
}
183183

184-
public static bool HideOtherMenuMaya()
184+
public static bool HideSendToUnityMenu()
185185
{
186-
return EditorTools.ExportSettings.instance.HideOtherMenuMaya;
186+
return EditorTools.ExportSettings.instance.HideSendToUnityMenu;
187187
}
188188

189189
public string GetModuleTemplatePath()

Assets/Integrations/Autodesk/maya/scripts/unitySetupUI.mel

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ global string $unityFamilyLabel = "The UnityFbxForMaya plugin allows you to reli
1111
global string $unityImportLabel = "Import FBX file from Unity Project and auto-configure for exporting";
1212
global string $unityExportLabel = "Export Model to Unity";
1313

14+
global string $removeOtherMenuString = "UnityFbxForMaya_RemoveOtherMenu";
15+
global string $sendToUnityString = "sendToUnityMenu";
16+
1417

1518
global proc string unityWhatsNewVersion(){
1619
return `about -q -version`;
@@ -19,6 +22,9 @@ global proc string unityWhatsNewVersion(){
1922

2023
global proc unitySetupUI(){
2124

25+
global string $removeOtherMenuString;
26+
global string $sendToUnityString;
27+
2228
$isHeadless = `optionVar -q "UnityFbxForMaya_Headless"`;
2329
if($isHeadless){
2430
// headless install, don't add UI
@@ -27,9 +33,9 @@ global proc unitySetupUI(){
2733

2834
evalDeferred -lowestPriority "buildFileMenu; \
2935
\
30-
$removeOtherMenu = `optionVar -q \"UnityFbxForMaya_RemoveOtherMenu\"`;\
36+
$removeOtherMenu = `optionVar -q $removeOtherMenuString`;\
3137
if($removeOtherMenu){\
32-
menu -e -visible false \"sendToUnityMenu\";\
38+
menu -e -visible false $sendToUnityString;\
3339
}\
3440
\
3541
$parentMenu = $gMainFileMenu; \

0 commit comments

Comments
 (0)