[Bf-blender-cvs] [1c21e088f22] master: Fix T50109: Blender crash when a "Render Result" as a Texture

Sergey Sharybin noreply at git.blender.org
Mon May 15 16:00:37 CEST 2017


Commit: 1c21e088f22d5658a3d96121303b01f7d27d23c1
Author: Sergey Sharybin
Date:   Mon May 15 15:59:47 2017 +0200
Branches: master
https://developer.blender.org/rB1c21e088f22d5658a3d96121303b01f7d27d23c1

Fix T50109: Blender crash when a "Render Result" as a Texture

This commit fixes crash, but user feedback can be improved here to
inform artist that one can't use Render Result as a texture since that
will cause feedback loop.

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

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 db917b0cdf5..ad9fb49baef 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -712,6 +712,10 @@ static void uiblock_layer_pass_buttons(
 	const char *display_name = "";
 	const bool show_stereo = (iuser->flag & IMA_SHOW_STEREO) != 0;
 
+	if (iuser->scene == NULL) {
+		return;
+	}
+
 	uiLayoutRow(layout, true);
 
 	/* layer menu is 1/3 larger than pass */




More information about the Bf-blender-cvs mailing list