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:
authorDalai Felinto <dfelinto@gmail.com>2018-05-16 22:40:05 +0300
committerDalai Felinto <dfelinto@gmail.com>2018-05-17 00:13:28 +0300
commite51bf11b15cb2c26b2bd33c377e1eb74fa8bde38 (patch)
tree0772e04362ca16c1511ccc48517e50e061187f22 /source/blender/render
parent09e419fa8da930b13651997417a434de308e697d (diff)
Remove ViewLayer settings - cleanup 1/2
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/extern/include/RE_engine.h5
-rw-r--r--source/blender/render/intern/source/external_engine.c13
2 files changed, 2 insertions, 16 deletions
diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h
index e857d508424..b401eb260d8 100644
--- a/source/blender/render/extern/include/RE_engine.h
+++ b/source/blender/render/extern/include/RE_engine.h
@@ -107,9 +107,6 @@ typedef struct RenderEngineType {
void (*update_script_node)(struct RenderEngine *engine, struct bNodeTree *ntree, struct bNode *node);
void (*update_render_passes)(struct RenderEngine *engine, struct Scene *scene, struct ViewLayer *view_layer);
- void (*collection_settings_create)(struct RenderEngine *engine, struct IDProperty *props);
- void (*render_settings_create)(struct RenderEngine *engine, struct IDProperty *props);
-
struct DrawEngineType *draw_engine;
/* RNA integration */
@@ -187,7 +184,7 @@ void RE_engine_register_pass(struct RenderEngine *engine, struct Scene *scene, s
void RE_engines_init(void);
void RE_engines_exit(void);
-void RE_engines_register(struct Main *bmain, RenderEngineType *render_type);
+void RE_engines_register(RenderEngineType *render_type);
bool RE_engine_is_opengl(RenderEngineType *render_type);
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index 1cdf4d3495b..3777845e4db 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -87,9 +87,6 @@ void RE_engines_exit(void)
DRW_engines_free();
- BKE_layer_collection_engine_settings_callback_free();
- BKE_view_layer_engine_settings_callback_free();
-
for (type = R_engines.first; type; type = next) {
next = type->next;
@@ -104,19 +101,11 @@ void RE_engines_exit(void)
}
}
-void RE_engines_register(Main *bmain, RenderEngineType *render_type)
+void RE_engines_register(RenderEngineType *render_type)
{
if (render_type->draw_engine) {
DRW_engine_register(render_type->draw_engine);
}
- if (render_type->collection_settings_create) {
- BKE_layer_collection_engine_settings_callback_register(
- bmain, render_type->idname, render_type->collection_settings_create);
- }
- if (render_type->render_settings_create) {
- BKE_view_layer_engine_settings_callback_register(
- bmain, render_type->idname, render_type->render_settings_create);
- }
BLI_addtail(&R_engines, render_type);
}