From 86c1cad1cf479be0b3125015926aeeb05d7b6065 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 19 Jun 2018 16:07:10 +0200 Subject: Fix missing render slots bugs after recent changes. --- source/blender/editors/space_image/image_edit.c | 3 ++- source/blender/editors/space_image/image_ops.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/space_image') diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c index 72d0051d260..f4ecd2e7d34 100644 --- a/source/blender/editors/space_image/image_edit.c +++ b/source/blender/editors/space_image/image_edit.c @@ -308,7 +308,8 @@ bool ED_image_slot_cycle(struct Image *image, int direction) slot = (cur + ((direction == -1) ? -i : i)) % num_slots; if (slot < 0) slot += num_slots; - if (BKE_image_get_renderslot(image, slot)->render || slot == image->last_render_slot) { + RenderSlot *render_slot = BKE_image_get_renderslot(image, slot); + if ((render_slot && render_slot->render) || slot == image->last_render_slot) { image->render_slot = slot; break; } diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index b852788f3bb..b2116b1a770 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -3464,7 +3464,8 @@ static int image_cycle_render_slot_exec(bContext *C, wmOperator *op) WM_event_add_notifier(C, NC_IMAGE | ND_DRAW, NULL); /* no undo push for browsing existing */ - if (BKE_image_get_renderslot(ima, ima->render_slot)->render || ima->render_slot == ima->last_render_slot) + RenderSlot *slot = BKE_image_get_renderslot(ima, ima->render_slot); + if ((slot && slot->render) || ima->render_slot == ima->last_render_slot) return OPERATOR_CANCELLED; return OPERATOR_FINISHED; -- cgit v1.2.3