5 files changed, 128 insertions, 22 deletions

diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c
index 8b8aabb2ce0..7236a99ad80 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -291,23 +291,24 @@ static void ui_imageuser_slot_menu(bContext *UNUSED(C), uiLayout *layout, void *
 {
 	uiBlock *block = uiLayoutGetBlock(layout);
 	Image *image = image_p;
-	int slot;
+	int slot_id;
 
 	uiDefBut(block, UI_BTYPE_LABEL, 0, IFACE_("Slot"),
 	         0, 0, UI_UNIT_X * 5, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
 	uiItemS(layout);
 
-	slot = IMA_MAX_RENDER_SLOT;
-	while (slot--) {
+	slot_id = BLI_listbase_count(&image->renderslots) - 1;
+	for (RenderSlot *slot = image->renderslots.last; slot; slot = slot->prev) {
 		char str[64];
-		if (image->render_slots[slot].name[0] != '\0') {
-			BLI_strncpy(str, image->render_slots[slot].name, sizeof(str));
+		if (slot->name[0] != '\0') {
+			BLI_strncpy(str, slot->name, sizeof(str));
 		}
 		else {
-			BLI_snprintf(str, sizeof(str), IFACE_("Slot %d"), slot + 1);
+			BLI_snprintf(str, sizeof(str), IFACE_("Slot %d"), slot_id + 1);
 		}
 		uiDefButS(block, UI_BTYPE_BUT_MENU, B_NOP, str, 0, 0,
-		          UI_UNIT_X * 5, UI_UNIT_X, &image->render_slot, (float) slot, 0.0, 0, -1, "");
+		          UI_UNIT_X * 5, UI_UNIT_X, &image->render_slot, (float) slot_id, 0.0, 0, -1, "");
+		slot_id--;
 	}
 }
 
@@ -708,8 +709,9 @@ static void uiblock_layer_pass_buttons(
 	/* menu buts */
 	if (render_slot) {
 		char str[64];
-		if (image->render_slots[*render_slot].name[0] != '\0') {
-			BLI_strncpy(str, image->render_slots[*render_slot].name, sizeof(str));
+		RenderSlot *slot = BKE_image_get_renderslot(image, *render_slot);
+		if (slot->name[0] != '\0') {
+			BLI_strncpy(str, slot->name, sizeof(str));
 		}
 		else {
 			BLI_snprintf(str, sizeof(str), IFACE_("Slot %d"), *render_slot + 1);
@@ -1313,7 +1315,7 @@ static int image_properties_toggle_exec(bContext *C, wmOperator *UNUSED(op))
 
 void IMAGE_OT_properties(wmOperatorType *ot)
 {
-	ot->name = "Properties";
+	ot->name = "Toggle Sidebar";
 	ot->idname = "IMAGE_OT_properties";
 	ot->description = "Toggle the properties region visibility";
 
@@ -1337,7 +1339,7 @@ static int image_scopes_toggle_exec(bContext *C, wmOperator *UNUSED(op))
 
 void IMAGE_OT_toolshelf(wmOperatorType *ot)
 {
-	ot->name = "Tool Shelf";
+	ot->name = "Toggle Toolbar";
 	ot->idname = "IMAGE_OT_toolshelf";
 	ot->description = "Toggles tool shelf display";
 
diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c
index 0eb6a2400d2..f4ecd2e7d34 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,19 @@ 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) {
+		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;
 		}
 	}
 
-	if (i == IMA_MAX_RENDER_SLOT) {
+	if (i == num_slots) {
 		image->render_slot = ((cur == 1) ? 0 : 1);
 	}
 
diff --git a/source/blender/editors/space_image/image_intern.h b/source/blender/editors/space_image/image_intern.h
index 9167a193f2d..49c2690daaf 100644
--- a/source/blender/editors/space_image/image_intern.h
+++ b/source/blender/editors/space_image/image_intern.h
@@ -83,6 +83,9 @@ void IMAGE_OT_unpack(struct wmOperatorType *ot);
 void IMAGE_OT_invert(struct wmOperatorType *ot);
 
 void IMAGE_OT_cycle_render_slot(struct wmOperatorType *ot);
+void IMAGE_OT_clear_render_slot(struct wmOperatorType *ot);
+void IMAGE_OT_add_render_slot(struct wmOperatorType *ot);
+void IMAGE_OT_remove_render_slot(struct wmOperatorType *ot);
 
 void IMAGE_OT_sample(struct wmOperatorType *ot);
 void IMAGE_OT_sample_line(struct wmOperatorType *ot);
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 39544eb55dd..b2116b1a770 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1538,7 +1538,7 @@ static int image_replace_exec(bContext *C, wmOperator *op)
 		BKE_image_signal(bmain, sima->image, &sima->iuser, IMA_SIGNAL_SRC_CHANGE);
 	}
 
-	if (BLI_testextensie_array(str, imb_ext_movie))
+	if (BLI_path_extension_check_array(str, imb_ext_movie))
 		sima->image->source = IMA_SRC_MOVIE;
 	else
 		sima->image->source = IMA_SRC_FILE;
@@ -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 (ima->renders[ima->render_slot] || 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;
@@ -3487,6 +3488,97 @@ void IMAGE_OT_cycle_render_slot(wmOperatorType *ot)
 	RNA_def_boolean(ot->srna, "reverse", 0, "Cycle in Reverse", "");
 }
 
+/********************* clear render slot operator *********************/
+
+static int image_clear_render_slot_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	SpaceImage *sima = CTX_wm_space_image(C);
+	Image *ima = CTX_data_edit_image(C);
+
+	if (!BKE_image_clear_renderslot(ima, &sima->iuser, ima->render_slot)) {
+		return OPERATOR_CANCELLED;
+	}
+
+	WM_event_add_notifier(C, NC_IMAGE | ND_DRAW, NULL);
+
+	return OPERATOR_FINISHED;
+}
+
+void IMAGE_OT_clear_render_slot(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Clear Render Slot";
+	ot->idname = "IMAGE_OT_clear_render_slot";
+	ot->description = "Clear the currently selected render slot";
+
+	/* api callbacks */
+	ot->exec = image_clear_render_slot_exec;
+	ot->poll = image_cycle_render_slot_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER;
+}
+
+/********************* add render slot operator *********************/
+
+static int image_add_render_slot_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Image *ima = CTX_data_edit_image(C);
+
+	RenderSlot *slot = BKE_image_add_renderslot(ima, NULL);
+	ima->render_slot = BLI_findindex(&ima->renderslots, slot);
+
+	WM_event_add_notifier(C, NC_IMAGE | ND_DRAW, NULL);
+
+	return OPERATOR_FINISHED;
+}
+
+void IMAGE_OT_add_render_slot(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Add Render Slot";
+	ot->idname = "IMAGE_OT_add_render_slot";
+	ot->description = "Add a new render slot";
+
+	/* api callbacks */
+	ot->exec = image_add_render_slot_exec;
+	ot->poll = image_cycle_render_slot_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER;
+}
+
+/********************* remove render slot operator *********************/
+
+static int image_remove_render_slot_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	SpaceImage *sima = CTX_wm_space_image(C);
+	Image *ima = CTX_data_edit_image(C);
+
+	if (!BKE_image_remove_renderslot(ima, &sima->iuser, ima->render_slot)) {
+		return OPERATOR_CANCELLED;
+	}
+
+	WM_event_add_notifier(C, NC_IMAGE | ND_DRAW, NULL);
+
+	return OPERATOR_FINISHED;
+}
+
+void IMAGE_OT_remove_render_slot(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Remove Render Slot";
+	ot->idname = "IMAGE_OT_remove_render_slot";
+	ot->description = "Remove the current render slot";
+
+	/* api callbacks */
+	ot->exec = image_remove_render_slot_exec;
+	ot->poll = image_cycle_render_slot_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER;
+}
+
 /********************** change frame operator *********************/
 
 static int change_frame_poll(bContext *C)
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index c143ebbcd67..e84b596530e 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -272,6 +272,9 @@ static void image_operatortypes(void)
 	WM_operatortype_append(IMAGE_OT_invert);
 
 	WM_operatortype_append(IMAGE_OT_cycle_render_slot);
+	WM_operatortype_append(IMAGE_OT_clear_render_slot);
+	WM_operatortype_append(IMAGE_OT_add_render_slot);
+	WM_operatortype_append(IMAGE_OT_remove_render_slot);
 
 	WM_operatortype_append(IMAGE_OT_sample);
 	WM_operatortype_append(IMAGE_OT_sample_line);
@@ -358,7 +361,7 @@ static void image_keymap(struct wmKeyConfig *keyconf)
 	RNA_boolean_set(kmi->ptr, "toggle", true);
 
 	/* fast switch to render slots */
-	for (i = 0; i < MIN2(IMA_MAX_RENDER_SLOT, 9); i++) {
+	for (i = 0; i < 9; i++) {
 		kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_int", ONEKEY + i, KM_PRESS, 0, 0);
 		RNA_string_set(kmi->ptr, "data_path", "space_data.image.render_slots.active_index");
 		RNA_int_set(kmi->ptr, "value", i);
@@ -869,7 +872,7 @@ static void image_buttons_region_init(wmWindowManager *wm, ARegion *ar)
 
 static void image_buttons_region_draw(const bContext *C, ARegion *ar)
 {
-	ED_region_panels(C, ar, NULL, -1, true);
+	ED_region_panels(C, ar);
 }
 
 static void image_buttons_region_listener(
@@ -944,7 +947,7 @@ static void image_tools_region_draw(const bContext *C, ARegion *ar)
 	}
 	ED_space_image_release_buffer(sima, ibuf, lock);
 
-	ED_region_panels(C, ar, NULL, -1, true);
+	ED_region_panels(C, ar);
 }
 
 static void image_tools_region_listener(
@@ -1096,7 +1099,6 @@ void ED_spacetype_image(void)
 	art->init = image_main_region_init;
 	art->draw = image_main_region_draw;
 	art->listener = image_main_region_listener;
-
 	BLI_addhead(&st->regiontypes, art);
 
 	/* regions: listview/buttons */
@@ -1134,5 +1136,9 @@ void ED_spacetype_image(void)
 
 	BLI_addhead(&st->regiontypes, art);
 
+	/* regions: hud */
+	art = ED_area_type_hud(st->spaceid);
+	BLI_addhead(&st->regiontypes, art);
+
 	BKE_spacetype_register(st);
 }