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

finalize order properly

Browse Source
This commit is contained in:
David Rose 2005-04-23 00:09:04 +00:00
parent 9b560c9370
commit 360f0bbaa2
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/gobj/qpgeom.cxx
View File

@ -1047,6 +1047,14 @@ make_from_bam(const FactoryParams &params) {
void qpGeom:: void qpGeom::
finalize(BamReader *manager) { finalize(BamReader *manager) {
CDWriter cdata(_cycler); CDWriter cdata(_cycler);
// Make sure our GeomVertexData is finalized first. This may result
// in the data getting finalized multiple times, but it doesn't mind
// that.
if (cdata->_data != (qpGeomVertexData *)NULL) {
cdata->_data->finalize(manager);
}
reset_geom_rendering(cdata); reset_geom_rendering(cdata);
} }

4
panda/src/gobj/qpgeomVertexData.cxx
View File

@ -1533,6 +1533,10 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void qpGeomVertexData:: void qpGeomVertexData::
finalize(BamReader *manager) { finalize(BamReader *manager) {
// NOTE: This method may be called more than once, because the
// Geom::finalize() will call it explicitly. We have to be prepared
// to accept multiple finalize() calls.
// Now we need to register the format that we have read from the bam // Now we need to register the format that we have read from the bam
// file (since it doesn't come out of the bam file automatically // file (since it doesn't come out of the bam file automatically
// registered). This may change the format's pointer, which we // registered). This may change the format's pointer, which we