RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

This commit is contained in:
David Rose 2001-05-02 16:15:53 +00:00
parent a52d0720f1
commit 893ecf7d5e
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandatool/src/converter/somethingToEggConverter.cxx
View File

@ -87,7 +87,7 @@ convert_path(const Filename &orig_filename, const DSearchPath &searchpath,
case PC_absolute:
result = as_found;
if (result.is_local()) {
if (!result.exists()) {
nout << "Warning: file " << orig_filename << " not found.\n";
return result;
}

20
pandatool/src/eggbase/somethingToEgg.cxx
View File

@ -279,9 +279,23 @@ post_command_line() {
_make_rel_dir = _input_filename.get_dirname();
}
if (_got_search_path && _append_to_sys_paths) {
get_texture_path().prepend_path(_search_path);
get_model_path().prepend_path(_search_path);
if (_append_to_sys_paths) {
DSearchPath &texture_path = get_texture_path();
DSearchPath &model_path = get_model_path();
// Prepend the source filename to the search paths.
Filename directory = _input_filename.get_dirname();
if (directory.empty()) {
directory = ".";
}
texture_path.prepend_directory(directory);
model_path.prepend_directory(directory);
// Then prepend whatever the user specified on the command line.
if (_got_search_path) {
texture_path.prepend_path(_search_path);
model_path.prepend_path(_search_path);
}
}
return EggConverter::post_command_line();