[Bf-blender-cvs] [ed397ff5078] blender-v3.0-release: Fix T94506: Crash in Compositing

Sergey Sharybin noreply at git.blender.org
Tue Jan 11 10:38:39 CET 2022


Commit: ed397ff50786530dea127be26058f71abf0e3a3b
Author: Sergey Sharybin
Date:   Wed Jan 5 12:31:03 2022 +0100
Branches: blender-v3.0-release
https://developer.blender.org/rBed397ff50786530dea127be26058f71abf0e3a3b

Fix T94506: Crash in Compositing

===================================================================

M	source/blender/render/intern/render_result.c

===================================================================

diff --git a/source/blender/render/intern/render_result.c b/source/blender/render/intern/render_result.c
index 0681bcd9aa5..fa772827c2e 100644
--- a/source/blender/render/intern/render_result.c
+++ b/source/blender/render/intern/render_result.c
@@ -477,6 +477,12 @@ RenderResult *render_result_new(Render *re,
 
 void render_result_passes_allocated_ensure(RenderResult *rr)
 {
+  if (rr == NULL) {
+    /* Happens when the result was not yet allocated for the current scene or slot configuration.
+     */
+    return;
+  }
+
   LISTBASE_FOREACH (RenderLayer *, rl, &rr->layers) {
     LISTBASE_FOREACH (RenderPass *, rp, &rl->passes) {
       if (rl->exrhandle != NULL && !STREQ(rp->name, RE_PASSNAME_COMBINED)) {



More information about the Bf-blender-cvs mailing list