1 files changed, 12 insertions, 0 deletions
diff --git a/src/mesa/tnl/t_vb_normals.c b/src/mesa/tnl/t_vb_normals.c
index 732e7c6f4e..d82008821f 100644
--- a/src/mesa/tnl/t_vb_normals.c
+++ b/src/mesa/tnl/t_vb_normals.c
@@ -68,11 +68,23 @@ static GLboolean run_normal_stage( GLcontext *ctx,
       else
          lengths = VB->NormalLengthPtr;
 
+      /* If there is only one normal, don't transform it multiple times:
+       */
+      if (VB->NormalPtr->stride == 0)
+	 VB->NormalPtr->count = 1;
+
       store->NormalTransform( ctx->ModelviewMatrixStack.Top,
 			      ctx->_ModelViewInvScale,
 			      VB->NormalPtr,  /* input normals */
 			      lengths,
 			      &store->normal ); /* resulting normals */
+
+      if (VB->NormalPtr->stride == 0) {
+	 VB->NormalPtr->count = VB->Count;
+	 store->normal.stride = 0;
+      }
+      else
+	 store->normal.stride = 16;	
    }
 
    VB->NormalPtr = &store->normal;