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

unavailable textures referenced by a bam file should not cause a crash

Browse Source
This commit is contained in:
David Rose 2004-08-04 23:35:51 +00:00
parent c23792f1dc
commit 1074bb00cc
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
panda/src/pgraph/textureAttrib.cxx
View File

@ -714,21 +714,30 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
// Pre-bam 4.11, a null pointer meant to turn off texturing.
_off_all_stages = true;
}
}
else {
pgraph_cat.debug() << "came here filling in textureattrib " << (void *)this << "\n";
} else {
OffStages::iterator ci = _off_stages.begin();
while (ci != _off_stages.end()) {
TextureStage *ts = DCAST(TextureStage, p_list[pi++]);
*ci = ts;
++ci;
}
// read the pointers of the on_textures
for (int i=0; i<_num_on_textures; ++i) {
_on_stages.reserve(_num_on_textures);
for (int i = 0; i < _num_on_textures; ++i) {
TextureStage *ts = DCAST(TextureStage, p_list[pi++]);
Texture *tx = DCAST(Texture, p_list[pi++]);
_on_textures[ts] = tx;
_on_stages.push_back(ts);
if (tx != (Texture *)NULL) {
_on_textures[ts] = tx;
_on_stages.push_back(ts);
} else {
// If we couldn't load a texture pointer, turn off that
// particular texture stage.
_off_stages.push_back(ts);
}
}
}
_sort_seq = UpdateSeq::old();