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:
authorBrecht Van Lommel <brecht@blender.org>2021-07-29 17:34:54 +0300
committerBrecht Van Lommel <brecht@blender.org>2021-07-29 18:59:03 +0300
commit0b0c2901f603a7f38a550446125a0e70cd0c29eb (patch)
tree90c845a2b1b10532dabc72427f9ff5f379b54094 /source/blender/render/intern/render_result.c
parent646f7ef73ce647b0384ca9491ec8cbfacc38ab54 (diff)
Render: remove unused Blender Internal view layer settings
These should have been removed earlier but were forgotten.
Diffstat (limited to 'source/blender/render/intern/render_result.c')
-rw-r--r--source/blender/render/intern/render_result.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/render/intern/render_result.c b/source/blender/render/intern/render_result.c
index 53252cdb42f..693cddbebbe 100644
--- a/source/blender/render/intern/render_result.c
+++ b/source/blender/render/intern/render_result.c
@@ -332,7 +332,6 @@ RenderResult *render_result_new(
BLI_strncpy(rl->name, view_layer->name, sizeof(rl->name));
rl->layflag = view_layer->layflag;
- /* for debugging: view_layer->passflag | SCE_PASS_RAYHITS; */
rl->passflag = view_layer->passflag;
rl->rectx = rectx;
@@ -399,9 +398,6 @@ RenderResult *render_result_new(
if (view_layer->passflag & SCE_PASS_MIST) {
RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 1, RE_PASSNAME_MIST, view, "Z");
}
- if (rl->passflag & SCE_PASS_RAYHITS) {
- RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 4, RE_PASSNAME_RAYHITS, view, "RGB");
- }
if (view_layer->passflag & SCE_PASS_DIFFUSE_DIRECT) {
RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_DIFFUSE_DIRECT, view, "RGB");
}
@@ -474,7 +470,7 @@ RenderResult *render_result_new(
}
/* NOTE: this has to be in sync with `scene.c`. */
- rl->layflag = 0x7FFF; /* solid ztra halo strand */
+ rl->layflag = SCE_LAY_FLAG_DEFAULT;
rl->passflag = SCE_PASS_COMBINED;
re->active_view_layer = 0;
@@ -581,7 +577,6 @@ static int passtype_from_name(const char *name)
CHECK_PASS(INDEXOB);
CHECK_PASS(INDEXMA);
CHECK_PASS(MIST);
- CHECK_PASS(RAYHITS);
CHECK_PASS(DIFFUSE_DIRECT);
CHECK_PASS(DIFFUSE_INDIRECT);
CHECK_PASS(DIFFUSE_COLOR);