From 0692fc9665d089cbb7779a444864fa431986abf2 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Thu, 9 Feb 2017 11:48:09 +0100 Subject: [PATCH] CollectionEngineSettings calculate: set COLLECTION_PROP_USE for combined property This way the render engines can have a fallback value (scene or layer default value) for the shader values that were never set. --- source/blender/blenkernel/intern/layer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index 667b40751ed..a674d08442e 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -910,6 +910,8 @@ static void collection_engine_settings_copy(CollectionEngineSettings *ces_dst, C */ static void collection_engine_property_set (CollectionEngineProperty *prop_dst, CollectionEngineProperty *prop_src){ if ((prop_src->flag & COLLECTION_PROP_USE) != 0) { + /* mark the property as used, so the engine knows if the value was ever set*/ + prop_dst->flag |= COLLECTION_PROP_USE; switch (prop_src->type) { case COLLECTION_PROP_TYPE_FLOAT: ((CollectionEnginePropertyFloat *)prop_dst)->value = ((CollectionEnginePropertyFloat *)prop_src)->value;