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.
This commit is contained in:
Sergey Sharybin 2016-06-29 13:08:12 +05:00
parent c7eb5eeaa9
commit 2f532c7844
Notes: blender-bot 2023-02-14 11:18:07 +01:00
Referenced by issue #48748, BI Material Diffuse color isn't showing in Texture Shading mode
Referenced by issue #48728, vertex colors not shown in texture mode
1 changed files with 3 additions and 1 deletions

View File

@ -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;
}
}