From 85e7d7c1d889f867762c6f62070729089f1877ac Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sat, 3 Nov 2001 04:11:26 +0000
Subject: fix error in error checking conditional (bug 476846)

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

(limited to 'src/mesa')

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 7838577db3..3e955c7004 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1,4 +1,4 @@
-/* $Id: teximage.c,v 1.104 2001/09/18 23:06:14 kschultz Exp $ */
+/* $Id: teximage.c,v 1.105 2001/11/03 04:11:26 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -665,7 +665,7 @@ texture_error_check( GLcontext *ctx, GLenum target,
           _mesa_error( ctx, GL_INVALID_ENUM, "glTexImage2D(target)" );
           return GL_TRUE;
       }
-      if (target == GL_PROXY_TEXTURE_2D && target == GL_TEXTURE_2D)
+      if (target == GL_PROXY_TEXTURE_2D || target == GL_TEXTURE_2D)
          maxLevels = ctx->Const.MaxTextureLevels;
       else
          maxLevels = ctx->Const.MaxCubeTextureLevels;
-- 
cgit v1.2.3