diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2018-05-16 22:40:05 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2018-05-17 00:13:28 +0300 |
commit | e51bf11b15cb2c26b2bd33c377e1eb74fa8bde38 (patch) | |
tree | 0772e04362ca16c1511ccc48517e50e061187f22 /source/blender/draw/engines | |
parent | 09e419fa8da930b13651997417a434de308e697d (diff) |
Remove ViewLayer settings - cleanup 1/2
Diffstat (limited to 'source/blender/draw/engines')
5 files changed, 3 insertions, 39 deletions
diff --git a/source/blender/draw/engines/basic/basic_engine.c b/source/blender/draw/engines/basic/basic_engine.c index 1a1a3bd7af4..76407d057a2 100644 --- a/source/blender/draw/engines/basic/basic_engine.c +++ b/source/blender/draw/engines/basic/basic_engine.c @@ -245,7 +245,7 @@ DrawEngineType draw_engine_basic_type = { RenderEngineType DRW_engine_viewport_basic_type = { NULL, NULL, BASIC_ENGINE, N_("Basic"), RE_INTERNAL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, &draw_engine_basic_type, {NULL, NULL, NULL} }; diff --git a/source/blender/draw/engines/clay/clay_engine.c b/source/blender/draw/engines/clay/clay_engine.c index 9c4bc90d3a1..8731fd7cdcf 100644 --- a/source/blender/draw/engines/clay/clay_engine.c +++ b/source/blender/draw/engines/clay/clay_engine.c @@ -938,22 +938,6 @@ static void clay_draw_scene(void *vedata) } } -static void clay_layer_collection_settings_create(RenderEngine *UNUSED(engine), IDProperty *props) -{ - BLI_assert(props && - props->type == IDP_GROUP && - props->subtype == IDP_GROUP_SUB_ENGINE_RENDER); - UNUSED_VARS_NDEBUG(props); -} - -static void clay_view_layer_settings_create(RenderEngine *UNUSED(engine), IDProperty *props) -{ - BLI_assert(props && - props->type == IDP_GROUP && - props->subtype == IDP_GROUP_SUB_ENGINE_RENDER); - UNUSED_VARS_NDEBUG(props); -} - static void clay_engine_free(void) { DRW_SHADER_FREE_SAFE(e_data.clay_sh); @@ -989,8 +973,6 @@ RenderEngineType DRW_engine_viewport_clay_type = { NULL, NULL, CLAY_ENGINE, N_("Clay"), RE_INTERNAL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - &clay_layer_collection_settings_create, - &clay_view_layer_settings_create, &draw_engine_clay_type, {NULL, NULL, NULL} }; diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c index 4ef6644698f..8448393aa97 100644 --- a/source/blender/draw/engines/eevee/eevee_engine.c +++ b/source/blender/draw/engines/eevee/eevee_engine.c @@ -423,22 +423,6 @@ static void eevee_engine_free(void) EEVEE_volumes_free(); } -static void eevee_layer_collection_settings_create(RenderEngine *UNUSED(engine), IDProperty *props) -{ - BLI_assert(props && - props->type == IDP_GROUP && - props->subtype == IDP_GROUP_SUB_ENGINE_RENDER); - UNUSED_VARS_NDEBUG(props); -} - -static void eevee_view_layer_settings_create(RenderEngine *UNUSED(engine), IDProperty *props) -{ - BLI_assert(props && - props->type == IDP_GROUP && - props->subtype == IDP_GROUP_SUB_ENGINE_RENDER); - UNUSED_VARS_NDEBUG(props); -} - static const DrawEngineDataSize eevee_data_size = DRW_VIEWPORT_DATA_SIZE(EEVEE_Data); DrawEngineType draw_engine_eevee_type = { @@ -462,8 +446,6 @@ RenderEngineType DRW_engine_viewport_eevee_type = { EEVEE_ENGINE, N_("Eevee"), RE_INTERNAL | RE_USE_SHADING_NODES | RE_USE_PREVIEW, NULL, &DRW_render_to_image, NULL, NULL, NULL, NULL, &EEVEE_render_update_passes, - &eevee_layer_collection_settings_create, - &eevee_view_layer_settings_create, &draw_engine_eevee_type, {NULL, NULL, NULL} }; diff --git a/source/blender/draw/engines/external/external_engine.c b/source/blender/draw/engines/external/external_engine.c index ec0141953fe..c10d63e1ce7 100644 --- a/source/blender/draw/engines/external/external_engine.c +++ b/source/blender/draw/engines/external/external_engine.c @@ -226,7 +226,7 @@ DrawEngineType draw_engine_external_type = { RenderEngineType DRW_engine_viewport_external_type = { NULL, NULL, EXTERNAL_ENGINE, N_("External"), RE_INTERNAL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, &draw_engine_external_type, {NULL, NULL, NULL} }; diff --git a/source/blender/draw/engines/workbench/workbench_engine.c b/source/blender/draw/engines/workbench/workbench_engine.c index 248534d7e51..26ae1c289c8 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.c +++ b/source/blender/draw/engines/workbench/workbench_engine.c @@ -38,7 +38,7 @@ RenderEngineType DRW_engine_viewport_workbench_type = { NULL, NULL, WORKBENCH_ENGINE, N_("Workbench"), RE_INTERNAL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, &draw_engine_workbench_solid, {NULL, NULL, NULL} }; |