TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 15:53:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

mayapath: fix maya tools when running from pip installation

Browse Source 
Fixes #709
This commit is contained in:
rdb 2019-12-28 20:58:13 +01:00
parent 7b5e11e9c9
commit c2a5b08de5
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pandatool/src/mayaprogs/mayapath.cxx
View File

@ -195,7 +195,11 @@ int
main(int argc, char *argv[]) { main(int argc, char *argv[]) {
// First, get the command line and append _bin, so we will actually run // First, get the command line and append _bin, so we will actually run
// maya2egg_bin.exe, egg2maya_bin.exe, etc. // maya2egg_bin.exe, egg2maya_bin.exe, etc.
Filename command = Filename::from_os_specific(argv[0]); Filename command = ExecutionEnvironment::get_binary_name();
if (command.empty() || command == "unknown" || !command.exists()) {
command = Filename::from_os_specific(argv[0]);
if (!command.is_fully_qualified()) { if (!command.is_fully_qualified()) {
DSearchPath path; DSearchPath path;
path.append_path(ExecutionEnvironment::get_environment_variable("PATH")); path.append_path(ExecutionEnvironment::get_environment_variable("PATH"));
@ -204,17 +208,9 @@ main(int argc, char *argv[]) {
#endif #endif
command.resolve_filename(path); command.resolve_filename(path);
} }
#ifdef _WIN32
if (command.get_extension() == "exe") {
command.set_extension("");
} }
#endif
command = command.get_fullpath() + string("_bin"); command.set_basename_wo_extension(command.get_basename_wo_extension() + "_bin");
#ifdef _WIN32
command.set_extension("exe");
#endif
string os_command = command.to_os_specific(); string os_command = command.to_os_specific();
// First start with $PANDA_MAYA_LOCATION. If it is set, it overrides // First start with $PANDA_MAYA_LOCATION. If it is set, it overrides