From ffff89ff4187183ae86e07d9c67fb7e5c0da636c Mon Sep 17 00:00:00 2001 From: georges <> Date: Thu, 15 Feb 2001 23:37:26 +0000 Subject: [PATCH] fix bug in prev checkin --- panda/src/dxgsg/dxGraphicsStateGuardian.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panda/src/dxgsg/dxGraphicsStateGuardian.cxx b/panda/src/dxgsg/dxGraphicsStateGuardian.cxx index c5d60a478f..4f2d6e472d 100644 --- a/panda/src/dxgsg/dxGraphicsStateGuardian.cxx +++ b/panda/src/dxgsg/dxGraphicsStateGuardian.cxx @@ -1924,7 +1924,7 @@ draw_tri(const GeomTri *geom) { // nassertv(coords.size==norms.size); nassertv(coords.size==colors.size); nassertv(coords.size==texcoords.size); need to assert only if we have this w/same binding // indexed mode requires all used norms,colors,texcoords,coords array be the same // length, or 0 or 1 (dwStride==0), also requires all elements to use the same index array - } else if(!(vindexes==NULL)&&(cindexes==NULL)&&(tindexes==NULL)&&(nindexes==NULL)) + } else if(!((vindexes==NULL)&&(cindexes==NULL)&&(tindexes==NULL)&&(nindexes==NULL))) GeomVrtFmt=MixedFmtVerts; #ifdef DONT_USE_DRAWPRIMSTRIDED @@ -2432,7 +2432,7 @@ draw_multitri(const Geom *geom, D3DPRIMITIVETYPE trilisttype) { // nassertv(coords.size==norms.size); nassertv(coords.size==colors.size); nassertv(coords.size==texcoords.size); need to assert only if we have this w/same binding // indexed mode requires all used norms,colors,texcoords,coords array be the same // length, or 0 or 1 (dwStride==0), also requires all elements to use the same index array - } else if(!(vindexes==NULL)&&(cindexes==NULL)&&(tindexes==NULL)&&(nindexes==NULL)) + } else if(!((vindexes==NULL)&&(cindexes==NULL)&&(tindexes==NULL)&&(nindexes==NULL))) GeomVrtFmt=MixedFmtVerts; #ifdef DONT_USE_DRAWPRIMSTRIDED