adjustment to prev chkin

This commit is contained in:
cxgeorge 2001-06-15 20:35:59 +00:00
parent ff97614e76
commit 7009801eb1
1 changed files with 2 additions and 4 deletions

View File

@ -2314,9 +2314,7 @@ draw_multitri(Geom *geom, D3DPRIMITIVETYPE trilisttype) {
GeomVrtFmt=MixedFmtVerts;
#endif
if(pLengthArr==NULL) {
assert(geom->get_num_vertices_per_prim()==4);
// we've been called by draw_quad, which has no lengths array
if(!geom->uses_components()) {
GeomVrtFmt=MixedFmtVerts; // dont need efficiency here, just use simpler codepath
}
@ -2410,7 +2408,7 @@ draw_multitri(Geom *geom, D3DPRIMITIVETYPE trilisttype) {
memset(&dps_data,0,sizeof(D3DDRAWPRIMITIVESTRIDEDDATA));
#ifdef _DEBUG
// nassertv(geom->uses_components());
nassertv(geom->uses_components());
nassertv(geom->get_binding(G_COORD) == G_PER_VERTEX);
#endif