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:
authorJeroen Bakker <j.bakker@atmind.nl>2018-04-19 10:45:52 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2018-04-19 10:45:52 +0300
commit16fac020e07d7ad0caa5901c0740c88e9772194f (patch)
tree505cf49b33f2ce6d8edae69b7355ca1ea092aca9 /source/blender/draw/engines/workbench/workbench_engine.c
parent1f5d51e44ecf99f34d8e733559a9312e5ae3ef33 (diff)
Workbench: Option to use Object color
- added `object_color_type` where the user can set if the collection determines the color, or the object will be used for the color. Implemented it as an enum as later this can have a random color option. - moved OB_LIGHTING_* to DNA_view3d_types and renamed it. - Fixed some DRY in workbench_materials.c. Can remove more DRY's but will need to discuss the responsibility of the workbench engine as it might become part of the eevee renderer.
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_engine.c')
-rw-r--r--source/blender/draw/engines/workbench/workbench_engine.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_engine.c b/source/blender/draw/engines/workbench/workbench_engine.c
index 2b6c95e301f..5a2c70ce810 100644
--- a/source/blender/draw/engines/workbench/workbench_engine.c
+++ b/source/blender/draw/engines/workbench/workbench_engine.c
@@ -49,6 +49,7 @@ static void workbench_layer_collection_settings_create(RenderEngine *UNUSED(engi
props->type == IDP_GROUP &&
props->subtype == IDP_GROUP_SUB_ENGINE_RENDER);
float default_object_color[3] = {1.0, 1.0, 1.0};
+ BKE_collection_engine_property_add_int(props, "object_color_type", V3D_OBJECT_COLOR_COLLECTION);
BKE_collection_engine_property_add_float_array(props, "object_color", default_object_color, 3);
}