From cc22179cd855dad85a28c40416873a07e8b7cc0c Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 13 Jun 2001 14:55:25 +0000
Subject: fixed an assertion

---
 src/mesa/main/image.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index df7a89d005..376234285b 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.61 2001/05/16 20:27:12 brianp Exp $ */
+/* $Id: image.c,v 1.62 2001/06/13 14:55:25 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -1720,7 +1720,7 @@ _mesa_pack_rgba_span( GLcontext *ctx,
                       const struct gl_pixelstore_attrib *dstPacking,
                       GLuint transferOps)
 {
-   ASSERT((ctx->NewState & _NEW_PIXEL) == 0);
+   ASSERT((ctx->NewState & _NEW_PIXEL) == 0 || transferOps == 0);
 
    /* Test for optimized case first */
    if (transferOps == 0 && dstFormat == GL_RGBA && dstType == CHAN_TYPE) {
-- 
cgit v1.2.3