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:
authorJulian Eisel <julian@blender.org>2021-09-15 23:34:20 +0300
committerJulian Eisel <julian@blender.org>2021-09-15 23:34:20 +0300
commitda9be470b546928e3e4320003b333d0aad1c9073 (patch)
tree3879b762dc226f0b6a55d8e5bdafcfba7dc0c3b9 /source/blender/render/intern/render_result.c
parentad7588600c35423b2908756afd694331f08aeb20 (diff)
parent28bd74c18650a8362bc791df602097967ff5efdf (diff)
Merge branch 'master' into temp-cocoa-scroll-acceleration-fixtemp-cocoa-scroll-acceleration-fix
Diffstat (limited to 'source/blender/render/intern/render_result.c')
-rw-r--r--source/blender/render/intern/render_result.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/render/intern/render_result.c b/source/blender/render/intern/render_result.c
index c29ab342ed7..6cb6aabe885 100644
--- a/source/blender/render/intern/render_result.c
+++ b/source/blender/render/intern/render_result.c
@@ -250,6 +250,9 @@ RenderPass *render_layer_add_pass(RenderResult *rr,
BLI_addtail(&rl->passes, rpass);
+ /* The result contains non-allocated pass now, so tag it as such. */
+ rr->passes_allocated = false;
+
return rpass;
}