[Bf-blender-cvs] [e51bf11b15c] blender2.8: Remove ViewLayer settings - cleanup 1/2
Dalai Felinto
noreply at git.blender.org
Wed May 16 23:16:20 CEST 2018
Commit: e51bf11b15cb2c26b2bd33c377e1eb74fa8bde38
Author: Dalai Felinto
Date: Wed May 16 21:40:05 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBe51bf11b15cb2c26b2bd33c377e1eb74fa8bde38
Remove ViewLayer settings - cleanup 1/2
===================================================================
M source/blender/blenkernel/BKE_layer.h
M source/blender/blenkernel/intern/blender.c
M source/blender/blenkernel/intern/layer.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/writefile.c
M source/blender/draw/engines/basic/basic_engine.c
M source/blender/draw/engines/clay/clay_engine.c
M source/blender/draw/engines/eevee/eevee_engine.c
M source/blender/draw/engines/external/external_engine.c
M source/blender/draw/engines/workbench/workbench_engine.c
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/modes/edit_armature_mode.c
M source/blender/draw/modes/edit_curve_mode.c
M source/blender/draw/modes/edit_lattice_mode.c
M source/blender/draw/modes/edit_metaball_mode.c
M source/blender/draw/modes/edit_surface_mode.c
M source/blender/draw/modes/edit_text_mode.c
M source/blender/draw/modes/paint_texture_mode.c
M source/blender/draw/modes/pose_mode.c
M source/blender/draw/modes/sculpt_mode.c
M source/blender/makesdna/DNA_layer_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_layer.c
M source/blender/makesrna/intern/rna_render.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/render/extern/include/RE_engine.h
M source/blender/render/intern/source/external_engine.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index 3205392a795..4bfb00e6493 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -56,8 +56,6 @@ struct SceneCollection;
struct ViewLayer;
struct WorkSpace;
-void BKE_layer_exit(void);
-
struct ViewLayer *BKE_view_layer_default_view(const struct Scene *scene);
struct ViewLayer *BKE_view_layer_default_render(const struct Scene *scene);
struct ViewLayer *BKE_view_layer_from_workspace_get(const struct Scene *scene, const struct WorkSpace *workspace);
@@ -132,36 +130,10 @@ void BKE_override_view_layer_int_add(struct ViewLayer *view_layer, int id_type,
void BKE_override_layer_collection_boolean_add(struct LayerCollection *layer_collection, int id_type, const char *data_path, const bool value);
-/* engine settings */
-typedef void (*EngineSettingsCB)(struct RenderEngine *engine, struct IDProperty *props);
-
-struct IDProperty *BKE_layer_collection_engine_scene_get(struct Scene *scene, const char *engine_name);
-void BKE_layer_collection_engine_settings_callback_register(struct Main *bmain, const char *engine_name, EngineSettingsCB func);
-void BKE_layer_collection_engine_settings_callback_free(void);
-void BKE_layer_collection_engine_settings_create(struct IDProperty *root);
-void BKE_layer_collection_engine_settings_validate_scene(struct Scene *scene);
-
-struct IDProperty *BKE_view_layer_engine_evaluated_get(struct ViewLayer *view_layer, const char *engine_name);
-struct IDProperty *BKE_view_layer_engine_scene_get(struct Scene *scene, const char *engine_name);
-void BKE_view_layer_engine_settings_callback_register(struct Main *bmain, const char *engine_name, EngineSettingsCB func);
-void BKE_view_layer_engine_settings_callback_free(void);
-void BKE_view_layer_engine_settings_validate_scene(struct Scene *scene);
-void BKE_view_layer_engine_settings_create(struct IDProperty *root);
-
-void BKE_collection_engine_property_add_float(struct IDProperty *props, const char *name, float value);
-void BKE_collection_engine_property_add_float_array(
- struct IDProperty *props, const char *name, const float *values, const int array_length);
-void BKE_collection_engine_property_add_int(struct IDProperty *props, const char *name, int value);
-void BKE_collection_engine_property_add_bool(struct IDProperty *props, const char *name, bool value);
-
int BKE_collection_engine_property_value_get_int(struct IDProperty *props, const char *name);
float BKE_collection_engine_property_value_get_float(struct IDProperty *props, const char *name);
const float *BKE_collection_engine_property_value_get_float_array(struct IDProperty *props, const char *name);
bool BKE_collection_engine_property_value_get_bool(struct IDProperty *props, const char *name);
-void BKE_collection_engine_property_value_set_int(struct IDProperty *props, const char *name, int value);
-void BKE_collection_engine_property_value_set_float(struct IDProperty *props, const char *name, float value);
-void BKE_collection_engine_property_value_set_float_array(struct IDProperty *props, const char *name, const float *values);
-void BKE_collection_engine_property_value_set_bool(struct IDProperty *props, const char *name, bool value);
/* evaluation */
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 236b965ec34..3f78b096115 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -104,8 +104,6 @@ void BKE_blender_free(void)
BKE_sequencer_cache_destruct();
IMB_moviecache_destruct();
- BKE_layer_exit();
-
free_nodesystem();
}
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index bdc1ceda46d..c8fe2e111d4 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -68,10 +68,6 @@ static void layer_collection_free(ViewLayer *view_layer, LayerCollection *lc);
static void layer_collection_objects_populate(ViewLayer *view_layer, LayerCollection *lc, ListBase *objects);
static LayerCollection *layer_collection_add(ViewLayer *view_layer, LayerCollection *parent, SceneCollection *sc);
static LayerCollection *find_layer_collection_by_scene_collection(LayerCollection *lc, const SceneCollection *sc);
-static IDProperty *collection_engine_settings_create(struct EngineSettingsCB_Type *ces_type, const bool populate);
-static IDProperty *collection_engine_get(IDProperty *root, const char *engine_name);
-static void collection_engine_settings_init(IDProperty *root, const bool populate);
-static void layer_engine_settings_init(IDProperty *root, const bool populate);
static void object_bases_iterator_next(BLI_Iterator *iter, const int flag);
/* RenderLayer */
@@ -200,11 +196,6 @@ void BKE_view_layer_free_ex(ViewLayer *view_layer, const bool do_id_user)
}
BLI_freelistN(&view_layer->layer_collections);
- if (view_layer->properties_evaluated) {
- IDP_FreeProperty(view_layer->properties_evaluated);
- MEM_freeN(view_layer->properties_evaluated);
- }
-
for (ViewLayerEngineData *sled = view_layer->drawdata.first; sled; sled = sled->next) {
if (sled->storage) {
if (sled->free) {
@@ -475,7 +466,6 @@ void BKE_view_layer_copy_data(
BKE_freestyle_config_copy(&view_layer_dst->freestyle_config, &view_layer_src->freestyle_config, flag);
view_layer_dst->stats = NULL;
- view_layer_dst->properties_evaluated = NULL;
/* we start fresh with no overrides and no visibility flags set
* instead of syncing both trees we simply unlink and relink the scene collection */
@@ -1391,217 +1381,9 @@ void BKE_override_layer_collection_boolean_add(struct LayerCollection *layer_col
TODO_LAYER_OVERRIDE;
}
-/* ---------------------------------------------------------------------- */
-/* Engine Settings */
-
-ListBase R_layer_collection_engines_settings_callbacks = {NULL, NULL};
-ListBase R_view_layer_engines_settings_callbacks = {NULL, NULL};
-
-typedef struct EngineSettingsCB_Type {
- struct EngineSettingsCB_Type *next, *prev;
-
- char name[MAX_NAME]; /* engine name */
-
- EngineSettingsCB callback;
-
-} EngineSettingsCB_Type;
-
-static void create_engine_settings_scene(IDProperty *root, EngineSettingsCB_Type *es_type)
-{
- if (collection_engine_get(root, es_type->name)) {
- return;
- }
-
- IDProperty *props = collection_engine_settings_create(es_type, true);
- IDP_AddToGroup(root, props);
-}
-
-static void create_layer_collection_engine_settings_scene(Scene *scene, EngineSettingsCB_Type *es_type)
-{
- create_engine_settings_scene(scene->collection_properties, es_type);
-}
-
-static void create_view_layer_engine_settings_scene(Scene *scene, EngineSettingsCB_Type *es_type)
-{
- create_engine_settings_scene(scene->layer_properties, es_type);
-}
-
-static void create_layer_collection_engines_settings_scene(Scene *scene, EngineSettingsCB_Type *es_type)
-{
- /* Populate the scene with the new settings. */
- create_layer_collection_engine_settings_scene(scene, es_type);
-}
-
-static void create_view_layer_engines_settings_scene(Scene *scene, EngineSettingsCB_Type *es_type)
-{
- /* Populate the scene with the new settings. */
- create_view_layer_engine_settings_scene(scene, es_type);
-}
-
-static EngineSettingsCB_Type *engine_settings_callback_register(const char *engine_name, EngineSettingsCB func, ListBase *lb)
-{
- EngineSettingsCB_Type *es_type;
-
- /* Cleanup in case it existed. */
- es_type = BLI_findstring(lb, engine_name, offsetof(EngineSettingsCB_Type, name));
-
- if (es_type) {
- BLI_remlink(lb, es_type);
- MEM_freeN(es_type);
- }
-
- es_type = MEM_callocN(sizeof(EngineSettingsCB_Type), __func__);
- BLI_strncpy_utf8(es_type->name, engine_name, sizeof(es_type->name));
- es_type->callback = func;
- BLI_addtail(lb, es_type);
-
- return es_type;
-}
-
-void BKE_layer_collection_engine_settings_callback_register(
- Main *bmain, const char *engine_name, EngineSettingsCB func)
-{
- EngineSettingsCB_Type *es_type =
- engine_settings_callback_register(engine_name, func, &R_layer_collection_engines_settings_callbacks);
-
- if (bmain) {
- /* Populate all of the collections of the scene with those settings. */
- for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
- create_layer_collection_engines_settings_scene(scene, es_type);
- }
- }
-}
-
-void BKE_view_layer_engine_settings_callback_register(
- Main *bmain, const char *engine_name, EngineSettingsCB func)
-{
- EngineSettingsCB_Type *es_type =
- engine_settings_callback_register(engine_name, func, &R_view_layer_engines_settings_callbacks);
-
- if (bmain) {
- /* Populate all of the collections of the scene with those settings. */
- for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
- create_view_layer_engines_settings_scene(scene, es_type);
- }
- }
-}
-
-void BKE_layer_collection_engine_settings_callback_free(void)
-{
- BLI_freelistN(&R_layer_collection_engines_settings_callbacks);
-}
-
-void BKE_view_layer_engine_settings_callback_free(void)
-{
- BLI_freelistN(&R_view_layer_engines_settings_callbacks);
-}
-
-/**
- * Create a root IDProperty for this engine
- *
- * \param populate whether we want to pre-fill the collection with the default properties
- */
-static IDProperty *collection_engine_settings_create(EngineSettingsCB_Type *es_type, const bool populate)
-{
- IDProperty *props;
- IDPropertyTemplate val = {0};
-
- props = IDP_New(IDP_GROUP, &val, es_type->name);
- props->subtype = IDP_GROUP_SUB_ENGINE_RENDER;
-
- /* properties */
- if (populate) {
- es_type->callback(NULL, props);
- }
-
- return props;
-}
-
-static void layer_collection_create_render_settings(IDProperty *root, const bool populate)
-{
- EngineSettingsCB_Type *es_type;
- for (es_type = R_layer_collection_engines_settings_callbacks.first; es_type; es_type = es_type->next) {
- IDProperty *props = collection_engine_settings_create(es_type, populate);
- IDP_AddToGroup(root, props);
- }
-}
-
-static void view_layer_create_render_settings(IDProperty *root, const bool populate)
-{
- EngineSettingsCB_Type *es_type;
- for (es_type = R_view_layer_engines_settings_callbacks.fi
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list