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

fix problem with relative textures within an .mf file

This commit is contained in:
David Rose 2006-10-01 18:01:43 +00:00
parent e8adeefe24
commit 80dbd8130b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/egg/eggGroupNode.cxx
View File

@ -422,6 +422,8 @@ has_absolute_pathnames() const {
////////////////////////////////////////////////////////////////////
void EggGroupNode::
resolve_filenames(const DSearchPath &searchpath) {
VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr();
Children::iterator ci;
for (ci = _children.begin();
ci != _children.end();
@ -430,19 +432,19 @@ resolve_filenames(const DSearchPath &searchpath) {
if (child->is_of_type(EggTexture::get_class_type())) {
EggTexture *tex = DCAST(EggTexture, child);
Filename tex_filename = tex->get_filename();
tex_filename.resolve_filename(searchpath);
vfs->resolve_filename(tex_filename, searchpath);
tex->set_filename(tex_filename);
if (tex->has_alpha_filename()) {
Filename alpha_filename = tex->get_alpha_filename();
alpha_filename.resolve_filename(searchpath);
vfs->resolve_filename(alpha_filename, searchpath);
tex->set_alpha_filename(alpha_filename);
}
} else if (child->is_of_type(EggFilenameNode::get_class_type())) {
EggFilenameNode *fnode = DCAST(EggFilenameNode, child);
Filename filename = fnode->get_filename();
filename.resolve_filename(searchpath, fnode->get_default_extension());
vfs->resolve_filename(filename, searchpath, fnode->get_default_extension());
fnode->set_filename(filename);
} else if (child->is_of_type(EggGroupNode::get_class_type())) {