[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46940] branches/soc-2012-swiss_cheese/ source/blender/gpu/intern/gpu_immediate.c: fixed undefined symbol in GPU_immediate that wasn' t caught because I was not building in debug mode.

Jason Wilkins Jason.A.Wilkins at gmail.com
Wed May 23 16:28:42 CEST 2012


Revision: 46940
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46940
Author:   jwilkins
Date:     2012-05-23 14:28:41 +0000 (Wed, 23 May 2012)
Log Message:
-----------
fixed undefined symbol in GPU_immediate that wasn't caught because I was not building in debug mode.

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.c

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.c	2012-05-23 14:24:40 UTC (rev 46939)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.c	2012-05-23 14:28:41 UTC (rev 46940)
@@ -571,8 +571,8 @@
 	CHECK();
 
 	for (i = 0; i < GPU_IMMEDIATE->textureUnitCount; i++) {
-		assert(sizes[i] >= GL_TEXTURE0);
-		assert(sizes[i] <= GL_TEXTURE32);
+		assert(map[i] >= GL_TEXTURE0);
+		assert(map[i] <= GL_TEXTURE31);
 
 		if (GPU_IMMEDIATE->textureUnitMap[i] != map[i]) {
 			GPU_IMMEDIATE->textureUnitMap[i] = map[i];




More information about the Bf-blender-cvs mailing list