Skip to content

Commit 1d38b55

Browse files
committed
fix so it works on Windows
1 parent 481540e commit 1d38b55

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

Assets/FbxExporters/Editor/InstallIntegration.cs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,15 @@ class Integrations
1414
private const string VERSION_FIELD = "**Version**";
1515
private const string VERSION_TAG = "{Version}";
1616
private const string PROJECT_TAG = "{UnityProject}";
17-
private static string MAYA_COMMANDS { get { return string.Format(@"configureUnityOneClick {1}{0}{1};", Integrations.GetProjectPath(), @"" + (char) 34); } }
18-
17+
private static string MAYA_COMMANDS { get {
18+
#if UNITY_EDITOR_OSX || UNITY_EDITOR_LINUX
19+
return string.Format(@"configureUnityOneClick {1}{0}{1};",
20+
Integrations.GetProjectPath(), @"" + (char) 34);
21+
#else
22+
return string.Format("configureUnityOneClick \\{1}{0}\\{1};",
23+
Integrations.GetProjectPath().Replace("\\","/"), @"" + (char) 34);
24+
#endif
25+
}}
1926
private static Char[] FIELD_SEPARATORS = new Char[] {':'};
2027

2128
private const string MODULE_TEMPLATE_PATH = "Integrations/Autodesk/maya"+VERSION_TAG+"/unityoneclick.mod";
@@ -189,7 +196,7 @@ public static int ConfigureMaya(string version)
189196
}
190197

191198
myProcess.StartInfo.FileName = mayaPath;
192-
myProcess.StartInfo.Arguments = string.Format("{0} -command '{1}'", mayaPath, MAYA_COMMANDS);
199+
myProcess.StartInfo.Arguments = string.Format("-command \"{0}\"", MAYA_COMMANDS);
193200
#endif
194201
myProcess.EnableRaisingEvents = true;
195202
myProcess.Start();

Assets/Integrations/Autodesk/maya2017/plug-ins/unityOneClickPlugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
kPluginInfo = { 'name': version.pluginName(), 'version': version.versionName(), 'vendor': version.vendorName() }
2626
kVerbose = True
27-
kHeadlessInstall = maya.cmds.optionVar( exists='UnityOneClick_Headless' )
27+
kHeadlessInstall = maya.cmds.optionVar( exists='UnityOneClick_Headless' ) and maya.cmds.optionVar( q='UnityOneClick_Headless' ) == 1
2828

2929
# initialize the script plug-in
3030
def initializePlugin(mobject):

0 commit comments

Comments
 (0)