[Bf-blender-cvs] [839fe335d2d] blender-v2.83-release: Fix crash after 475bd6b occuring on each render end, we need another nullcheck here

Jens Verwiebe noreply at git.blender.org
Wed Apr 29 10:27:12 CEST 2020


Commit: 839fe335d2d6333830fd7236925c01d9db909bda
Author: Jens Verwiebe
Date:   Tue Apr 28 23:49:52 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB839fe335d2d6333830fd7236925c01d9db909bda

Fix crash after 475bd6b occuring on each render end, we need another nullcheck here

(cherry picked from commit 3ea67e08fe8e3edc73daf13769dd631dbf920c45)

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

M	source/blender/editors/space_image/image_buttons.c

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

diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c
index fcd6baa9582..6f3ef44fe94 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -656,7 +656,7 @@ static void uiblock_layer_pass_buttons(
     /* pass */
     rpass = (rl ? BLI_findlink(&rl->passes, iuser->pass) : NULL);
 
-    if (RE_passes_have_name(rl)) {
+    if (rl && RE_passes_have_name(rl)) {
       display_name = rpass ? rpass->name : "";
       rnd_pt = ui_imageuser_data_copy(&rnd_pt_local);
       but = uiDefMenuBut(block,



More information about the Bf-blender-cvs mailing list