From 5a9cd6a14d5fd9b2e6a9648a27fce6f7dae7ad73 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Fri, 3 Feb 2017 12:06:46 +0100 Subject: Util function to create CollectionEngineSettings This may be run by Depsgraph, as well as internal layercollection create routines --- source/blender/blenkernel/BKE_layer.h | 1 + source/blender/blenkernel/intern/layer.c | 38 ++++++++++++++++++++++++-------- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h index 3253c1e5e29..e796ef93fda 100644 --- a/source/blender/blenkernel/BKE_layer.h +++ b/source/blender/blenkernel/BKE_layer.h @@ -99,6 +99,7 @@ typedef void (*CollectionEngineSettingsCB)(struct RenderEngine *engine, struct C struct CollectionEngineSettings *BKE_layer_collection_engine_get(struct LayerCollection *lc, const char *engine_name); void BKE_layer_collection_engine_settings_callback_register(struct Main *bmain, const char *engine_name, CollectionEngineSettingsCB func); void BKE_layer_collection_engine_settings_callback_free(void); +void BKE_layer_collection_engine_settings_create(struct ListBase *lb, const char *engine_name); void BKE_layer_collection_engine_settings_free(struct ListBase *lb); void BKE_collection_engine_property_add_float(struct CollectionEngineSettings *ces, const char *name, float value); diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index d64a2ba585e..4b28eb99f07 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -45,11 +45,13 @@ #include "MEM_guardedalloc.h" /* prototype */ +struct CollectionEngineSettingsCB_Type; static void layer_collection_free(SceneLayer *sl, LayerCollection *lc); static LayerCollection *layer_collection_add(SceneLayer *sl, ListBase *lb, SceneCollection *sc); static LayerCollection *find_layer_collection_by_scene_collection(LayerCollection *lc, const SceneCollection *sc); -static void object_bases_Iterator_next(Iterator *iter, const int flag); +static void collection_engine_settings_create(ListBase *lb, struct CollectionEngineSettingsCB_Type *ces_type); static void layer_collection_create_engine_settings(LayerCollection *lc); +static void object_bases_Iterator_next(Iterator *iter, const int flag); /* RenderLayer */ @@ -596,20 +598,13 @@ typedef struct CollectionEngineSettingsCB_Type { } CollectionEngineSettingsCB_Type; - static void create_engine_settings_layer_collection(LayerCollection *lc, CollectionEngineSettingsCB_Type *ces_type) { if (BKE_layer_collection_engine_get(lc, ces_type->name)) { return; } - /* create callback data */ - CollectionEngineSettings *ces = MEM_callocN(sizeof(CollectionEngineSettings), "Collection Engine Settings"); - BLI_strncpy_utf8(ces->name, ces_type->name, sizeof(ces->name)); - BLI_addtail(&lc->engine_settings, ces); - - /* call callback */ - ces_type->callback(NULL, ces); + collection_engine_settings_create(&lc->engine_settings, ces_type); for (LayerCollection *lcn = lc->layer_collections.first; lcn; lcn = lcn->next) { create_engine_settings_layer_collection(lcn, ces_type); @@ -656,6 +651,31 @@ void BKE_layer_collection_engine_settings_callback_free(void) BLI_freelistN(&R_engines_settings_callbacks); } +static void collection_engine_settings_create(ListBase *lb, CollectionEngineSettingsCB_Type *ces_type) +{ + /* create callback data */ + CollectionEngineSettings *ces = MEM_callocN(sizeof(CollectionEngineSettings), "Collection Engine Settings"); + BLI_strncpy_utf8(ces->name, ces_type->name, sizeof(ces->name)); + BLI_addtail(lb, ces); + + /* call callback */ + ces_type->callback(NULL, ces); +} + +/** + * Initialize a CollectionEngineSettings + * + * Usually we would pass LayerCollection->engine_settings + * But depsgraph uses this for Object->collection_settings + */ +void BKE_layer_collection_engine_settings_create(ListBase *lb, const char *engine_name) +{ + CollectionEngineSettingsCB_Type *ces_type; + ces_type = BLI_findstring(&R_engines_settings_callbacks, engine_name, offsetof(CollectionEngineSettingsCB_Type, name)); + BLI_assert(ces_type); + collection_engine_settings_create(lb, ces_type); +} + /** * Free the CollectionEngineSettings ListBase * -- cgit v1.2.3