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

deal with textures from bam files without filenames properly

This commit is contained in:
David Rose 2003-04-04 16:23:33 +00:00
parent 63f2f424db
commit 398442ee18
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
panda/src/gobj/texture.cxx
View File

@ -693,10 +693,19 @@ make_Texture(const FactoryParams &params) {
PT(Texture) me;
if (alpha_filename.empty()) {
me = TexturePool::load_texture(filename);
if (filename.empty()) {
// This texture has no filename; since we don't have an image to
// load, we can't actually create the texture.
gobj_cat.info()
<< "Cannot create texture '" << name << "' with no filename.\n";
} else {
me = TexturePool::load_texture(filename, alpha_filename);
// This texture does have a filename, so try to load it from disk.
if (alpha_filename.empty()) {
me = TexturePool::load_texture(filename);
} else {
me = TexturePool::load_texture(filename, alpha_filename);
}
}
if (me == (Texture *)NULL) {