diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-09-20 12:21:41 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-09-20 12:21:41 +0300 |
| commit | fde8682d96d44f7600d69aae23dac36f584afd9e (patch) | |
| tree | ce100e63d0d4fd39e18a99aea8259d02b0d4ff43 /source/blender/draw/engines | |
| parent | 44d0c868bf06967e29f545dee420c4dab9b7c8c0 (diff) | |
Fix T69995: Object Drawtype Set To Solid Issues
When setting an object draw type to Solid it always used the Material
color mode. This change only sets the material color when the viewport
is set to display textures.
Diffstat (limited to 'source/blender/draw/engines')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_materials.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c index c90604678db..0f9551a8cc9 100644 --- a/source/blender/draw/engines/workbench/workbench_materials.c +++ b/source/blender/draw/engines/workbench/workbench_materials.c @@ -261,8 +261,8 @@ int workbench_material_determine_color_type(WORKBENCH_PrivateData *wpd, int color_type = wpd->shading.color_type; const Mesh *me = (ob->type == OB_MESH) ? ob->data : NULL; - if ((color_type == V3D_SHADING_TEXTURE_COLOR && (ima == NULL || use_sculpt_pbvh)) || - (ob->dt < OB_TEXTURE)) { + if ((color_type == V3D_SHADING_TEXTURE_COLOR) && + (ima == NULL || use_sculpt_pbvh || (ob->dt < OB_TEXTURE))) { color_type = V3D_SHADING_MATERIAL_COLOR; } if (color_type == V3D_SHADING_VERTEX_COLOR && (me == NULL || me->mloopcol == NULL)) { |