[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50973] trunk/blender/source/blender/gpu/ intern/gpu_buffers.c: Fix: gpu_colors_enable could cause 3d display corruption because it always enables glColorMaterial .

[Antony Riakiotakis]

Revision: 50973
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50973
Author:   psy-fi
Date:     2012-10-01 07:53:54 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
Fix: gpu_colors_enable could cause 3d display corruption because it always enables glColorMaterial. Make sure to call gpu_colors_disable even if we don't have a mask layer, to match gpu_colors_enable above

Modified Paths:
--------------
    trunk/blender/source/blender/gpu/intern/gpu_buffers.c

Modified: trunk/blender/source/blender/gpu/intern/gpu_buffers.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_buffers.c	2012-10-01 06:34:02 UTC (rev 50972)
+++ trunk/blender/source/blender/gpu/intern/gpu_buffers.c	2012-10-01 07:53:54 UTC (rev 50973)
@@ -1986,7 +1986,7 @@
 	if (buffers->vert_buf && buffers->index_buf) {
 		glEnableClientState(GL_VERTEX_ARRAY);
 		glEnableClientState(GL_NORMAL_ARRAY);
-		if (buffers->vmask || buffers->gridkey.has_mask) {
+		if (has_mask) {
 			gpu_colors_enable(VBO_ENABLED);
 		}
 		else {
@@ -2036,6 +2036,9 @@
 		if (has_mask) {
 			gpu_colors_disable(VBO_ENABLED);
 		}
+		else {
+			gpu_colors_disable(VBO_DISABLED);
+		}
 	}
 	/* fallbacks if we are out of memory or VBO is disabled */
 	else if (buffers->totface) {