diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-02-28 18:51:10 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-02-28 18:51:24 +0300 |
| commit | ac8c4aad302f9671b3126f25c619b6be97a2a547 (patch) | |
| tree | c50ad1a5c922fb09efa14a34cb98221a10227222 /source/blender/draw/engines/workbench/workbench_materials.c | |
| parent | 846d265a06e39c86574cba6722495b6373596c7a (diff) | |
Revert "Objects: Remove Textured from object display type"
This reverts commit 6a4a984ff731070d0702821fe1e67dea40e593b9.
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_materials.c')
| -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 fc1fa646881..e721a4ccdb8 100644 --- a/source/blender/draw/engines/workbench/workbench_materials.c +++ b/source/blender/draw/engines/workbench/workbench_materials.c @@ -211,10 +211,10 @@ int workbench_material_get_accum_shader_index(WORKBENCH_PrivateData *wpd, bool u return index; } -int workbench_material_determine_color_type(WORKBENCH_PrivateData *wpd, Image *ima, Object *UNUSED(ob)) +int workbench_material_determine_color_type(WORKBENCH_PrivateData *wpd, Image *ima, Object *ob) { int color_type = wpd->shading.color_type; - if (color_type == V3D_SHADING_TEXTURE_COLOR && ima == NULL) { + if ((color_type == V3D_SHADING_TEXTURE_COLOR && ima == NULL) || (ob->dt < OB_TEXTURE)) { color_type = V3D_SHADING_MATERIAL_COLOR; } return color_type; |