[Bf-blender-cvs] [2f532c7] master: Fix T48728: Vertex colors not shown in texture mode

Sergey Sharybin noreply at git.blender.org
Wed Jun 29 10:09:43 CEST 2016


Commit: 2f532c78445a9de1e64014468049649ac1de39f1
Author: Sergey Sharybin
Date:   Wed Jun 29 13:08:12 2016 +0500
Branches: master
https://developer.blender.org/rB2f532c78445a9de1e64014468049649ac1de39f1

Fix T48728: Vertex colors not shown in texture mode

Regression caused by own changes to make texture paint more efficient
from workflow point of view.

Now the idea is to use vertex color outside of paint mode, so we don't
break any compatibility here.

===================================================================

M	source/blender/editors/space_view3d/drawmesh.c

===================================================================

diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c
index ee82a4c..4326d45 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -979,11 +979,13 @@ static void draw_mesh_textured_old(Scene *scene, View3D *v3d, RegionView3D *rv3d
 		if (ob == OBACT) {
 			if (ob->mode & OB_MODE_WEIGHT_PAINT) {
 				dm_draw_flag |= DM_DRAW_USE_COLORS | DM_DRAW_ALWAYS_SMOOTH | DM_DRAW_SKIP_HIDDEN;
-
 			}
 			else if (ob->mode & OB_MODE_SCULPT) {
 				dm_draw_flag |= DM_DRAW_SKIP_HIDDEN;
 			}
+			else if ((ob->mode & OB_MODE_ALL_PAINT) == 0) {
+				dm_draw_flag |= DM_DRAW_USE_COLORS;
+			}
 		}




More information about the Bf-blender-cvs mailing list