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

fix color-flatten issue some more

This commit is contained in:
David Rose 2008-02-20 04:16:36 +00:00
parent 514097b0d4
commit 61dc831678
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
panda/src/pgraph/geomNode.cxx
View File

@ -884,7 +884,18 @@ finalize(BamReader *manager) {
for (gi = geoms->begin(); gi != geoms->end(); ++gi) {
GeomEntry &entry = (*gi);
CPT(Geom) geom = entry._geom.get_read_pointer();
if (geom->get_vertex_data(current_thread)->has_column(color) &&
// Force the various GeomVertexArrayFormat objects to finalize
// themselves. We have to do this before we can reliably call
// GeomVertexData::has_column().
CPT(GeomVertexData) vdata = geom->get_vertex_data(current_thread);
CPT(GeomVertexFormat) vformat = vdata->get_format();
for (int i = 0; i < vformat->get_num_arrays(); ++i) {
const GeomVertexArrayFormat *varray = vformat->get_array(i);
manager->finalize_now((GeomVertexArrayFormat *)varray);
}
if (vdata->has_column(color) &&
entry._state->get_color() == (ColorAttrib *)NULL) {
// We'll be reassigning the RenderState. Therefore, save it
// temporarily to increment its reference count.