diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2018-12-22 01:26:04 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2018-12-27 17:22:33 +0300 |
| commit | 2c196de56bbb163048b08f321983234a5e72e804 (patch) | |
| tree | 1fa9bd7a8ec79167e07f57ab61cc5b50ba03a7e6 /source/blender/render | |
| parent | 21e4f3bd8c3b797d6b51cafbfb33e2bed9f42269 (diff) | |
cleanup: remove unused passes
- use_pass_indirect, use_pass_specular from ViewLayer RNA
- RGBA, DIFFUSE, SPEC, REFLECT, REFRACT, INDIRECT usages from remaining
places
Reviewers: brecht
Differential Revision: https://developer.blender.org/D4117
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/bake_api.c | 9 | ||||
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 6 | ||||
| -rw-r--r-- | source/blender/render/intern/source/render_result.c | 18 |
3 files changed, 0 insertions, 33 deletions
diff --git a/source/blender/render/intern/source/bake_api.c b/source/blender/render/intern/source/bake_api.c index c906413d7d7..6aa888d9f90 100644 --- a/source/blender/render/intern/source/bake_api.c +++ b/source/blender/render/intern/source/bake_api.c @@ -954,20 +954,11 @@ int RE_pass_depth(const eScenePassType pass_type) { return 2; } - case SCE_PASS_RGBA: - { - return 4; - } case SCE_PASS_COMBINED: - case SCE_PASS_DIFFUSE: - case SCE_PASS_SPEC: case SCE_PASS_SHADOW: - case SCE_PASS_REFLECT: case SCE_PASS_NORMAL: case SCE_PASS_VECTOR: - case SCE_PASS_REFRACT: case SCE_PASS_INDEXOB: /* XXX double check */ - case SCE_PASS_INDIRECT: case SCE_PASS_RAYHITS: /* XXX double check */ case SCE_PASS_EMIT: case SCE_PASS_ENVIRONMENT: diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index f3b1cc0d529..188da973f49 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2783,16 +2783,10 @@ RenderPass *RE_pass_find_by_type(volatile RenderLayer *rl, int passtype, const c CHECK_PASS(VECTOR); CHECK_PASS(NORMAL); CHECK_PASS(UV); - CHECK_PASS(RGBA); CHECK_PASS(EMIT); - CHECK_PASS(DIFFUSE); - CHECK_PASS(SPEC); CHECK_PASS(SHADOW); CHECK_PASS(AO); CHECK_PASS(ENVIRONMENT); - CHECK_PASS(INDIRECT); - CHECK_PASS(REFLECT); - CHECK_PASS(REFRACT); CHECK_PASS(INDEXOB); CHECK_PASS(INDEXMA); CHECK_PASS(MIST); diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index ea5ca18d58a..fc99be81ba3 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -350,26 +350,14 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_NORMAL, view, "XYZ"); if (view_layer->passflag & SCE_PASS_UV) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_UV, view, "UVA"); - if (view_layer->passflag & SCE_PASS_RGBA) - RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 4, RE_PASSNAME_RGBA, view, "RGBA"); if (view_layer->passflag & SCE_PASS_EMIT) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_EMIT, view, "RGB"); - if (view_layer->passflag & SCE_PASS_DIFFUSE) - RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_DIFFUSE, view, "RGB"); - if (view_layer->passflag & SCE_PASS_SPEC) - RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_SPEC, view, "RGB"); if (view_layer->passflag & SCE_PASS_AO) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_AO, view, "RGB"); if (view_layer->passflag & SCE_PASS_ENVIRONMENT) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_ENVIRONMENT, view, "RGB"); - if (view_layer->passflag & SCE_PASS_INDIRECT) - RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_INDIRECT, view, "RGB"); if (view_layer->passflag & SCE_PASS_SHADOW) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_SHADOW, view, "RGB"); - if (view_layer->passflag & SCE_PASS_REFLECT) - RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_REFLECT, view, "RGB"); - if (view_layer->passflag & SCE_PASS_REFRACT) - RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_REFRACT, view, "RGB"); if (view_layer->passflag & SCE_PASS_INDEXOB) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 1, RE_PASSNAME_INDEXOB, view, "X"); if (view_layer->passflag & SCE_PASS_INDEXMA) @@ -517,16 +505,10 @@ static int passtype_from_name(const char *name) CHECK_PASS(VECTOR); CHECK_PASS(NORMAL); CHECK_PASS(UV); - CHECK_PASS(RGBA); CHECK_PASS(EMIT); - CHECK_PASS(DIFFUSE); - CHECK_PASS(SPEC); CHECK_PASS(SHADOW); CHECK_PASS(AO); CHECK_PASS(ENVIRONMENT); - CHECK_PASS(INDIRECT); - CHECK_PASS(REFLECT); - CHECK_PASS(REFRACT); CHECK_PASS(INDEXOB); CHECK_PASS(INDEXMA); CHECK_PASS(MIST); |