[Bf-blender-cvs] [85e455b] master: Fix slot menu not displayed if render result slot is empty

[Julian Eisel]

Commit: 85e455b2458f68c1d2c75fed7b5963fce4a70027
Author: Julian Eisel
Date:   Thu Apr 23 13:21:36 2015 +0200
Branches: master
https://developer.blender.org/rB85e455b2458f68c1d2c75fed7b5963fce4a70027

Fix slot menu not displayed if render result slot is empty

Caused by own mistake in 31f984bc3ffcc83834, reported by @sebastian_k in
IRC

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

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 2fb0a7e..09ee5a2 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -1216,14 +1216,16 @@ void uiTemplateImageLayers(uiLayout *layout, bContext *C, Image *ima, ImageUser
 		RenderResult *rr;
 		const float dpi_fac = UI_DPI_FAC;
 		const int menus_width = 160 * dpi_fac;
+		const bool is_render_result = (ima->type == IMA_TYPE_R_RESULT);
 
 		/* use BKE_image_acquire_renderresult  so we get the correct slot in the menu */
 		rr = BKE_image_acquire_renderresult(scene, ima);
-		if (ima->type == IMA_TYPE_R_RESULT) {
+		if (rr && is_render_result) {
 			uiblock_layer_pass_arrow_buttons(layout, ima, rr, iuser, menus_width, &ima->render_slot);
 		}
 		else {
-			uiblock_layer_pass_buttons(layout, ima, rr, iuser, menus_width, NULL);
+			uiblock_layer_pass_buttons(layout, ima, rr, iuser, menus_width,
+			                           is_render_result ? &ima->render_slot : NULL);
 		}
 		BKE_image_release_renderresult(scene, ima);
 	}