mirror/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2026-02-21 06:39:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

oops, problem with missing textures

Browse Source
This commit is contained in:
David Rose
2001-08-08 18:07:46 +00:00
parent 94ac0d6980
commit 14b1a7eadc
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pandatool/src/egg-palettize/textureImage.cxx
View File

@@ -520,7 +520,7 @@ get_preferred_source() {
SourceTextureImage *best = (SourceTextureImage *)NULL;
int best_size = 0;
for (si = _sources.begin(); si != _sources.end() && !any_referenced; ++si) {
for (si = _sources.begin(); si != _sources.end(); ++si) {
SourceTextureImage *source = (*si).second;
if (source->get_egg_count() > 0 || !any_referenced) {
@@ -550,8 +550,20 @@ get_preferred_source() {
if (best == (SourceTextureImage *)NULL && !_sources.empty()) {
// If we didn't pick any that pass, it must be that all of them
// are unreadable. In this case, it really doesn't matter which
// one we pick.
best = (*_sources.begin()).second;
// one we pick, but we should at least pick one that has an egg
// reference, if any of them do.
if (any_referenced) {
for (si = _sources.begin();
si != _sources.end() && best == (SourceTextureImage *)NULL;
++si) {
SourceTextureImage *source = (*si).second;
if (source->get_egg_count() > 0) {
best = source;
}
}
} else {
best = (*_sources.begin()).second;
}
}
_preferred_source = best;