From fde8682d96d44f7600d69aae23dac36f584afd9e Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Fri, 20 Sep 2019 11:21:41 +0200 Subject: 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. --- source/blender/draw/engines/workbench/workbench_materials.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/draw/engines/workbench') 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)) { -- cgit v1.2.3