diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-19 17:07:10 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-19 17:19:49 +0300 |
| commit | 86c1cad1cf479be0b3125015926aeeb05d7b6065 (patch) | |
| tree | 19901d80ce180f766b4aec36592d2b5d7cf644b1 /source/blender/editors/space_image | |
| parent | 7c3ecbf040604d98375ac8839ca1787309f22372 (diff) | |
Fix missing render slots bugs after recent changes.
Diffstat (limited to 'source/blender/editors/space_image')
| -rw-r--r-- | source/blender/editors/space_image/image_edit.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 3 |
2 files changed, 4 insertions, 2 deletions
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; |