Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-12-21 03:40:47 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-12-21 03:45:01 +0300
commit9dde3e42a7c5bc5f7896fd30e2b3a5859d6857bf (patch)
tree11a429ba243ab47e526b7a9dbae5b3527edcb0c3 /source/blender/draw/engines/workbench/workbench_deferred.c
parentc8dfe763e521925c59522dc0abe0539727052807 (diff)
3D View: add object color drawing option
Has some advantages over existing options. - Using material links color to rendering with no way to vary colors if objects share a material. - Random gives no control, objects may randomly have the same color, duplicating an object often changes it's color.
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_deferred.c')
-rw-r--r--source/blender/draw/engines/workbench/workbench_deferred.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c b/source/blender/draw/engines/workbench/workbench_deferred.c
index 99c33697617..c3b469674d3 100644
--- a/source/blender/draw/engines/workbench/workbench_deferred.c
+++ b/source/blender/draw/engines/workbench/workbench_deferred.c
@@ -832,7 +832,8 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob)
DRW_shgroup_call_object_add(material->shgrp, geom_array[i], ob);
}
}
- else if (ELEM(wpd->shading.color_type, V3D_SHADING_SINGLE_COLOR, V3D_SHADING_RANDOM_COLOR)) {
+ else if (ELEM(wpd->shading.color_type,
+ V3D_SHADING_SINGLE_COLOR, V3D_SHADING_OBJECT_COLOR, V3D_SHADING_RANDOM_COLOR)) {
/* Draw solid color */
material = get_or_create_material_data(vedata, ob, NULL, NULL, wpd->shading.color_type);
if (is_sculpt_mode) {