Image: Refactor render slots to a dynamic list

Previously, render slots were hardcoded to a fixed amount.

With this change, render slots now are stored in a list. Therefore, users can add and/or remove as many slots as they want.

Credit to brecht for the UI part.

Reviewers: brecht, sergey

Differential Revision: https://developer.blender.org/D3474

1 files changed, 7 insertions, 5 deletions

diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c
index 0eb6a2400d2..72d0051d260 100644
--- a/source/blender/editors/space_image/image_edit.c
+++ b/source/blender/editors/space_image/image_edit.c
@@ -34,6 +34,7 @@
 #include "DNA_scene_types.h"
 
 #include "BLI_rect.h"
+#include "BLI_listbase.h"
 
 #include "BKE_colortools.h"
 #include "BKE_context.h"
@@ -302,17 +303,18 @@ bool ED_image_slot_cycle(struct Image *image, int direction)
 
 	BLI_assert(ELEM(direction, -1, 1));
 
-	for (i = 1; i < IMA_MAX_RENDER_SLOT; i++) {
-		slot = (cur + ((direction == -1) ? -i : i)) % IMA_MAX_RENDER_SLOT;
-		if (slot < 0) slot += IMA_MAX_RENDER_SLOT;
+	int num_slots = BLI_listbase_count(&image->renderslots);
+	for (i = 1; i < num_slots; i++) {
+		slot = (cur + ((direction == -1) ? -i : i)) % num_slots;
+		if (slot < 0) slot += num_slots;
 
-		if (image->renders[slot] || slot == image->last_render_slot) {
+		if (BKE_image_get_renderslot(image, slot)->render || slot == image->last_render_slot) {
 			image->render_slot = slot;
 			break;
 		}
 	}
 
-	if (i == IMA_MAX_RENDER_SLOT) {
+	if (i == num_slots) {
 		image->render_slot = ((cur == 1) ? 0 : 1);
 	}