[Bf-blender-cvs] [260da0c] master: Fix T48728, part 2: Vertex colors not shown in texture mode

[Sergey Sharybin]

Commit: 260da0cd9159bc2ea685f4cf03f131dc24e37db6
Author: Sergey Sharybin
Date:   Thu Jun 30 14:20:20 2016 +0500
Branches: master
https://developer.blender.org/rB260da0cd9159bc2ea685f4cf03f131dc24e37db6

Fix T48728, part 2: Vertex colors not shown in texture mode

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

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 a8df5c0..e0cba8d 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -986,6 +986,10 @@ static void draw_mesh_textured_old(Scene *scene, View3D *v3d, RegionView3D *rv3d
 			else if ((ob->mode & OB_MODE_TEXTURE_PAINT) == 0) {
 				dm_draw_flag |= DM_DRAW_USE_COLORS;
 			}
+		} else {
+			if ((ob->mode & OB_MODE_TEXTURE_PAINT) == 0) {
+				dm_draw_flag |= DM_DRAW_USE_COLORS;
+			}
 		}