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-30 12:20:20 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-06-30 12:20:20 +0300
commit260da0cd9159bc2ea685f4cf03f131dc24e37db6 (patch)
tree13c7a25d939c9f89b0432ef49d5922b52e1ce9b1
parentb01a56ee5c45b51e522c54c72b327c9aba34dff3 (diff)
Fix T48728, part 2: Vertex colors not shown in texture mode
-rw-r--r--source/blender/editors/space_view3d/drawmesh.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c
index a8df5c02881..e0cba8d9a48 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;
+ }
}