From 49927b3e0861f02708a95a4ae7f7120657c684f4 Mon Sep 17 00:00:00 2001
From: cxgeorge <>
Date: Wed, 6 Mar 2002 23:50:34 +0000
Subject: [PATCH] fix problem in draw_tri

---
 panda/src/dxgsg/dxGraphicsStateGuardian.cxx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/panda/src/dxgsg/dxGraphicsStateGuardian.cxx b/panda/src/dxgsg/dxGraphicsStateGuardian.cxx
index 1c702ff623..056d665b13 100644
--- a/panda/src/dxgsg/dxGraphicsStateGuardian.cxx
+++ b/panda/src/dxgsg/dxGraphicsStateGuardian.cxx
@@ -3016,24 +3016,23 @@ draw_tri(GeomTri *geom, GeomContext *gc) {
         bool bUseTexCoordOnlyLoop = ((ColorBinding != G_PER_VERTEX) &&
                                      (NormalBinding == G_OFF) &&
                                      (TexCoordBinding != G_OFF));
-
-        bool bPerPrimNormal;
-        bool bPerPrimColor=((_perPrim & PER_COLOR)!=0);
+        bool bPerPrimNormal=false;
 
         if(bUseTexCoordOnlyLoop) {
            _perVertex |= PER_TEXCOORD;  // TexCoords are either G_OFF or G_PER_VERTEX 
         } else {
             if(NormalBinding == G_PER_VERTEX)   
                 _perVertex |= PER_NORMAL;
-            else if(NormalBinding == G_PER_PRIM) 
+            else if(NormalBinding == G_PER_PRIM) {
                     _perPrim |= PER_NORMAL;
-
-            bPerPrimNormal=((_perPrim & PER_NORMAL)!=0);
+                    bPerPrimNormal=true;
+            }
 
             if(TexCoordBinding == G_PER_VERTEX) 
                _perVertex |= PER_TEXCOORD;
         } 
 
+        bool bPerPrimColor=(ColorBinding == G_PER_PRIM);
         if(bPerPrimColor)
            _perPrim |= PER_COLOR;
           else if(ColorBinding == G_PER_VERTEX)