[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45578] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: Fix part of #30917: solid + glsl + textured solid in texture paint mode did not

Brecht Van Lommel brechtvanlommel at pandora.be
Thu Apr 12 19:34:29 CEST 2012


Revision: 45578
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45578
Author:   blendix
Date:     2012-04-12 17:34:29 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Fix part of #30917: solid + glsl + textured solid in texture paint mode did not
show textured solid as it should, was using glsl instead.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2012-04-12 16:01:24 UTC (rev 45577)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2012-04-12 17:34:29 UTC (rev 45578)
@@ -3447,7 +3447,7 @@
 
 				GPU_disable_material();
 			}
-			else if (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_TEXTURE_PAINT)) {
+			else if (ob->mode & OB_MODE_VERTEX_PAINT) {
 				if (me->mloopcol)
 					dm->drawMappedFaces(dm, NULL, GPU_enable_material, NULL, NULL,
 					                    DM_DRAW_USE_COLORS | DM_DRAW_ALWAYS_SMOOTH);
@@ -6527,9 +6527,8 @@
 					zbufoff = 1;
 					dt = OB_SOLID;
 				}
-				else {
+				else if(ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT))
 					dt = OB_PAINT;
-				}
 
 				glEnable(GL_DEPTH_TEST);
 			}




More information about the Bf-blender-cvs mailing list