diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-06-29 11:08:12 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-06-29 11:08:12 +0300 |
| commit | 2f532c78445a9de1e64014468049649ac1de39f1 (patch) | |
| tree | 95ddb0819683d568e2dc389a5a084a6816a340fa /source/blender/editors | |
| parent | c7eb5eeaa9d28afd9513e9cbda789ab2b71bfba1 (diff) | |
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.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index ee82a4c5072..4326d45be83 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; + } } |