Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-06-29 11:30:58 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-06-29 11:31:45 +0300
commit68fcc3b1f6f14873c8b5bc7d47f46d7ac20dfc79 (patch)
tree6663d9fd5a98d3d3f663baa1113d437a505fd4ac
parent9e173afca30b0c7b2762d13eeeea595400877506 (diff)
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.
-rw-r--r--source/blender/editors/space_view3d/drawmesh.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c
index 4326d45be83..a8df5c02881 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;
}
}