[Bf-blender-cvs] [68fcc3b] master: Correction to previous commit: Only skip colors for texture paint

[Sergey Sharybin]

Commit: 68fcc3b1f6f14873c8b5bc7d47f46d7ac20dfc79
Author: Sergey Sharybin
Date:   Wed Jun 29 13:30:58 2016 +0500
Branches: master
https://developer.blender.org/rB68fcc3b1f6f14873c8b5bc7d47f46d7ac20dfc79

Correction to previous commit: Only skip colors for texture paint

This way we avoid regression of sculpt mode shading.

Hopefully now it's all fine.

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

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