TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

deploy-ng: fix MAIN_DIR when running from outside the main directory

Browse Source
This commit is contained in:
rdb 2018-04-08 17:26:39 +02:00
parent 023669c8c2
commit f5932bf070
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dtool/src/prc/configPageManager.cxx
View File

@ -129,8 +129,14 @@ reload_implicit_pages() {
blobinfo = nullptr; blobinfo = nullptr;
} }
if (blobinfo != nullptr && blobinfo->num_pointers >= 11 && blobinfo->main_dir != nullptr) { if (blobinfo != nullptr) {
ExecutionEnvironment::shadow_environment_variable("MAIN_DIR", blobinfo->main_dir); if (blobinfo->num_pointers >= 11 && blobinfo->main_dir != nullptr) {
ExecutionEnvironment::set_environment_variable("MAIN_DIR", blobinfo->main_dir);
} else {
// Make sure that py_panda.cxx won't override MAIN_DIR.
ExecutionEnvironment::set_environment_variable("MAIN_DIR",
ExecutionEnvironment::get_environment_variable("MAIN_DIR"));
}
} }
// PRC_PATTERNS lists one or more filename templates separated by spaces. // PRC_PATTERNS lists one or more filename templates separated by spaces.