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

fix assertion failure when texture is no longer used

Browse Source
This commit is contained in:
David Rose 2003-11-22 20:59:00 +00:00
parent 7398f2bfa2
commit b3fd81d53e
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandatool/src/palettizer/omitReason.cxx
View File

@ -41,6 +41,9 @@ operator << (ostream &out, OmitReason omit) {
case OR_unknown:
return out << "unknown";
case OR_unused:
return out << "unused";
}
return out << "**invalid**(" << (int)omit << ")";

4
pandatool/src/palettizer/omitReason.h
View File

@ -49,6 +49,10 @@ enum OmitReason {
OR_unknown,
// The texture file cannot be read, so its size can't be determined.
OR_unused,
// The texture is no longer used by any of the egg files that
// formerly referenced it.
};
ostream &operator << (ostream &out, OmitReason omit);

7
pandatool/src/palettizer/texturePlacement.cxx
View File

@ -282,7 +282,12 @@ determine_size() {
}
}
nassertr(_has_uvs, false);
if (!_has_uvs) {
force_replace();
_omit_reason = OR_unused;
return false;
}
TexCoordd rounded_min_uv = min_uv;
TexCoordd rounded_max_uv = max_uv;