Revert render slots commit for release, I can't find the bug or even redo

it myself, there will still be render slots just old implementation.

8 files changed, 80 insertions, 79 deletions

diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index dad5d533695..a4f419cf996 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -141,7 +141,7 @@ static void init_bake_internal(BakeRender *bkr, bContext *C)
 	bkr->sa= biggest_image_area(CTX_wm_screen(C)); /* can be NULL */
 	bkr->scene= scene;
 	bkr->actob= (scene->r.bake_flag & R_BAKE_TO_ACTIVE) ? OBACT : NULL;
-	bkr->re= RE_NewRender("_Bake View_");
+	bkr->re= RE_NewRender("_Bake View_", RE_SLOT_DEFAULT);
 
 	if(scene->r.bake_mode==RE_BAKE_AO) {
 		/* If raytracing or AO is disabled, switch it on temporarily for baking. */
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index 89a49b12751..76ed438ae41 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -474,7 +474,7 @@ static int ed_preview_draw_rect(ScrArea *sa, Scene *sce, ID *id, int split, int
 		}
 	}
 
-	re= RE_GetRender(name);
+	re= RE_GetRender(name, RE_SLOT_DEFAULT);
 	RE_AcquireResultImage(re, &rres);
 
 	if(rres.rectf) {
@@ -702,7 +702,7 @@ void BIF_view3d_previewrender(Scene *scene, ScrArea *sa)
 		ri->status= 0;
 		
 		sprintf(name, "View3dPreview %p", sa);
-		re= ri->re= RE_NewRender(name);
+		re= ri->re= RE_NewRender(name, RE_SLOT_DEFAULT);
 		//RE_display_draw_cb(re, view3d_previewrender_progress);
 		//RE_stats_draw_cb(re, view3d_previewrender_stats);
 		//RE_test_break_cb(re, qtest);
@@ -884,17 +884,24 @@ static void shader_preview_render(ShaderPreview *sp, ID *id, int split, int firs
 	char name[32];
 	int sizex;
 
+	if(GS(id->name) == ID_MA)
+		id= (ID*)copy_material_for_render((Material*)id);
+
 	/* get the stuff from the builtin preview dbase */
 	sce= preview_prepare_scene(sp->scene, id, idtype, sp); // XXX sizex
-	if(sce==NULL) return;
+	if(sce==NULL) {
+		if(GS(id->name) == ID_MA)
+			free_material((Material*)id);
+		return;
+	}
 	
 	if(!split || first) sprintf(name, "Preview %p", sp->owner);
 	else sprintf(name, "SecondPreview %p", sp->owner);
-	re= RE_GetRender(name);
+	re= RE_GetRender(name, RE_SLOT_DEFAULT);
 	
 	/* full refreshed render from first tile */
 	if(re==NULL)
-		re= RE_NewRender(name);
+		re= RE_NewRender(name, RE_SLOT_DEFAULT);
 		
 	/* sce->r gets copied in RE_InitState! */
 	sce->r.scemode &= ~(R_MATNODE_PREVIEW|R_TEXNODE_PREVIEW);
@@ -954,6 +961,9 @@ static void shader_preview_render(ShaderPreview *sp, ID *id, int split, int firs
 
 	/* unassign the pointers, reset vars */
 	preview_prepare_scene(sp->scene, NULL, GS(id->name), NULL);
+
+	if(GS(id->name) == ID_MA)
+		free_material((Material*)id);
 }
 
 /* runs inside thread for material and icons */
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 0e4498950fa..728ce622d9b 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -2894,23 +2894,18 @@ static void screen_set_image_output(bContext *C, int mx, int my)
 static int screen_render_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
-	Render *re= RE_GetRender(scene->id.name);
-	Image *ima;
+	Render *re= RE_GetRender(scene->id.name, RE_SLOT_VIEW);
 	
 	if(re==NULL) {
-		re= RE_NewRender(scene->id.name);
+		re= RE_NewRender(scene->id.name, RE_SLOT_VIEW);
 	}
 	RE_test_break_cb(re, NULL, (int (*)(void *)) blender_test_break);
-
-	ima= BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result");
-	BKE_image_signal(ima, NULL, IMA_SIGNAL_FREE);
-	BKE_image_backup_render(scene, ima);
-
+	
 	if(RNA_boolean_get(op->ptr, "animation"))
 		RE_BlenderAnim(re, scene, scene->r.sfra, scene->r.efra, scene->r.frame_step, op->reports);
 	else
 		RE_BlenderFrame(re, scene, NULL, scene->r.cfra);
-
+	
 	// no redraw needed, we leave state as we entered it
 	ED_update_for_newframe(C, 1);
 	
@@ -2939,7 +2934,7 @@ static void render_freejob(void *rjv)
 	MEM_freeN(rj);
 }
 
-/* str is IMA_MAX_RENDER_TEXT in size */
+/* str is IMA_RW_MAXTEXT in size */
 static void make_renderinfo_string(RenderStats *rs, Scene *scene, char *str)
 {
 	char info_time_str[32];	// used to be extern to header_info.c
@@ -2980,7 +2975,7 @@ static void make_renderinfo_string(RenderStats *rs, Scene *scene, char *str)
 		spos+= sprintf(spos, "| %s ", rs->infostr);
 	
 	/* very weak... but 512 characters is quite safe */
-	if(spos >= str+IMA_MAX_RENDER_TEXT)
+	if(spos >= str+IMA_RW_MAXTEXT)
 		if (G.f & G_DEBUG)
 			printf("WARNING! renderwin text beyond limit \n");
 	
@@ -2989,17 +2984,12 @@ static void make_renderinfo_string(RenderStats *rs, Scene *scene, char *str)
 static void image_renderinfo_cb(void *rjv, RenderStats *rs)
 {
 	RenderJob *rj= rjv;
-	RenderResult *rr;
 	
-	rr= RE_AcquireResultRead(rj->re);
-
 	/* malloc OK here, stats_draw is not in tile threads */
-	if(rr->text==NULL)
-		rr->text= MEM_callocN(IMA_MAX_RENDER_TEXT, "rendertext");
+	if(rj->image->render_text==NULL)
+		rj->image->render_text= MEM_callocN(IMA_RW_MAXTEXT, "rendertext");
 	
-	make_renderinfo_string(rs, rj->scene, rr->text);
-
-	RE_ReleaseResult(rj->re);
+	make_renderinfo_string(rs, rj->scene, rj->image->render_text);
 	
 	/* make jobs timer to send notifier */
 	*(rj->do_update)= 1;
@@ -3256,15 +3246,14 @@ static int screen_render_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	/* get a render result image, and make sure it is empty */
 	ima= BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result");
 	BKE_image_signal(ima, NULL, IMA_SIGNAL_FREE);
-	BKE_image_backup_render(rj->scene, ima);
 	rj->image= ima;
 	
 	/* setup new render */
-	re= RE_NewRender(scene->id.name);
+	re= RE_NewRender(scene->id.name, RE_SLOT_VIEW);
 	RE_test_break_cb(re, rj, render_breakjob);
 	RE_display_draw_cb(re, rj, image_rect_update);
 	RE_stats_draw_cb(re, rj, image_renderinfo_cb);
-
+	
 	rj->re= re;
 	G.afbreek= 0;
 	
@@ -3422,7 +3411,7 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op)
 	oglrender->iuser.ok= 1;
 	
 	/* create render and render result */
-	oglrender->re= RE_NewRender(scene->id.name);
+	oglrender->re= RE_NewRender(scene->id.name, RE_SLOT_VIEW);
 	RE_InitState(oglrender->re, NULL, &scene->r, NULL, sizex, sizey, NULL);
 	
 	rr= RE_AcquireResultWrite(oglrender->re);
diff --git a/source/blender/editors/space_file/writeimage.c b/source/blender/editors/space_file/writeimage.c
index c5bdade6153..07eb58bffbc 100644
--- a/source/blender/editors/space_file/writeimage.c
+++ b/source/blender/editors/space_file/writeimage.c
@@ -114,14 +114,14 @@ static void save_rendered_image_cb_real(char *name, int confirm)
 	
 	if(overwrite) {
 		if(scene->r.imtype==R_MULTILAYER) {
-			Render *re= RE_GetRender(scene->id.name);
+			Render *re= RE_GetRender(scene->id.name, RE_SLOT_VIEW);
 			RenderResult *rr= RE_AcquireResultRead(re);
 			if(rr) 
 				RE_WriteRenderResult(rr, str, scene->r.quality);
 			RE_ReleaseResult(re);
 		}
 		else {
-			Render *re= RE_GetRender(scene->id.name);
+			Render *re= RE_GetRender(scene->id.name, RE_SLOT_VIEW);
 			RenderResult rres;
 			ImBuf *ibuf;
 			
@@ -235,7 +235,7 @@ void BIF_save_rendered_image(char *name)
 /* calls fileselect */
 void BIF_save_rendered_image_fs(Scene *scene)
 {
-	Render *re= RE_GetRender(scene->id.name);
+	Render *re= RE_GetRender(scene->id.name, RE_SLOT_VIEW);
 	RenderResult rres;
 	
 	RE_AcquireResultImage(re, &rres);
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c
index bd5f8754990..01c53961f66 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -538,12 +538,12 @@ static char *slot_menu()
 	char *str;
 	int a, slot;
 	
-	str= MEM_callocN(IMA_MAX_RENDER_SLOT*32, "menu slots");
+	str= MEM_callocN(RE_SLOT_MAX*32, "menu slots");
 	
 	strcpy(str, "Slot %t");
 	a= strlen(str);
 
-	for(slot=0; slot<IMA_MAX_RENDER_SLOT; slot++)
+	for(slot=0; slot<RE_SLOT_MAX; slot++)
 		a += sprintf(str+a, "|Slot %d %%x%d", slot+1, slot);
 	
 	return str;
@@ -617,6 +617,7 @@ static void image_multi_cb(bContext *C, void *rr_v, void *iuser_v)
 {
 	ImageUser *iuser= iuser_v;
 
+	RE_SetViewSlot(iuser->menunr);
 	BKE_image_multilayer_index(rr_v, iuser); 
 	WM_event_add_notifier(C, NC_IMAGE|ND_DRAW, NULL);
 }
@@ -717,7 +718,7 @@ static void image_user_change(bContext *C, void *iuser_v, void *unused)
 }
 #endif
 
-static void uiblock_layer_pass_buttons(uiLayout *layout, RenderResult *rr, ImageUser *iuser, int w, short *render_slot)
+static void uiblock_layer_pass_buttons(uiLayout *layout, RenderResult *rr, ImageUser *iuser, int w, int render)
 {
 	uiBlock *block= uiLayoutGetBlock(layout);
 	uiBut *but;
@@ -733,9 +734,10 @@ static void uiblock_layer_pass_buttons(uiLayout *layout, RenderResult *rr, Image
 	wmenu3= (3*w)/6;
 	
 	/* menu buts */
-	if(render_slot) {
+	if(render) {
 		strp= slot_menu();
-		but= uiDefButS(block, MENU, 0, strp,					0, 0, wmenu1, 20, render_slot, 0,0,0,0, "Select Slot");
+		iuser->menunr= RE_GetViewSlot();
+		but= uiDefButS(block, MENU, 0, strp,					0, 0, wmenu1, 20, &iuser->menunr, 0,0,0,0, "Select Slot");
 		uiButSetFunc(but, image_multi_cb, rr, iuser);
 		MEM_freeN(strp);
 	}
@@ -754,7 +756,7 @@ static void uiblock_layer_pass_buttons(uiLayout *layout, RenderResult *rr, Image
 	}
 }
 
-static void uiblock_layer_pass_arrow_buttons(uiLayout *layout, RenderResult *rr, ImageUser *iuser, short *render_slot)
+static void uiblock_layer_pass_arrow_buttons(uiLayout *layout, RenderResult *rr, ImageUser *iuser, int render)
 {
 	uiBlock *block= uiLayoutGetBlock(layout);
 	uiLayout *row;
@@ -775,7 +777,7 @@ static void uiblock_layer_pass_arrow_buttons(uiLayout *layout, RenderResult *rr,
 	but= uiDefIconBut(block, BUT, 0, ICON_TRIA_RIGHT,	0,0,18,20, NULL, 0, 0, 0, 0, "Next Layer");
 	uiButSetFunc(but, image_multi_inclay_cb, rr, iuser);
 
-	uiblock_layer_pass_buttons(row, rr, iuser, 230, render_slot);
+	uiblock_layer_pass_buttons(row, rr, iuser, 230, render);
 
 	/* decrease, increase arrows */
 	but= uiDefIconBut(block, BUT, 0, ICON_TRIA_LEFT,	0,0,17,20, NULL, 0, 0, 0, 0, "Previous Pass");
@@ -884,9 +886,9 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, char *propn
 			}
 			else if(ima->type==IMA_TYPE_R_RESULT) {
 				/* browse layer/passes */
-				Render *re= RE_GetRender(scene->id.name);
+				Render *re= RE_GetRender(scene->id.name, RE_SLOT_VIEW);
 				RenderResult *rr= RE_AcquireResultRead(re);
-				uiblock_layer_pass_arrow_buttons(layout, rr, iuser, &ima->render_slot);
+				uiblock_layer_pass_arrow_buttons(layout, rr, iuser, 1);
 				RE_ReleaseResult(re);
 			}
 		}
@@ -913,7 +915,7 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, char *propn
 
 			/* multilayer? */
 			if(ima->type==IMA_TYPE_MULTILAYER && ima->rr) {
-				uiblock_layer_pass_arrow_buttons(layout, ima->rr, iuser, NULL);
+				uiblock_layer_pass_arrow_buttons(layout, ima->rr, iuser, 0);
 			}
 			else if(ima->source != IMA_SRC_GENERATED) {
 				if(compact == 0) {
@@ -993,7 +995,7 @@ void uiTemplateImageLayers(uiLayout *layout, bContext *C, Image *ima, ImageUser
 	/* render layers and passes */
 	if(ima && iuser) {
 		rr= BKE_image_acquire_renderresult(scene, ima);
-		uiblock_layer_pass_buttons(layout, rr, iuser, 160, (ima->type==IMA_TYPE_R_RESULT)? &ima->render_slot: NULL);
+		uiblock_layer_pass_buttons(layout, rr, iuser, 160, ima->type==IMA_TYPE_R_RESULT);
 		BKE_image_release_renderresult(scene, ima);
 	}
 }
diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c
index bc07222c9fb..cb942472b9e 100644
--- a/source/blender/editors/space_image/image_draw.c
+++ b/source/blender/editors/space_image/image_draw.c
@@ -64,8 +64,6 @@
 
 #include "WM_api.h"
 
-#include "RE_pipeline.h"
-
 #include "image_intern.h"
 
 #define HEADER_HEIGHT 18
@@ -92,35 +90,37 @@ static void image_verify_buffer_float(SpaceImage *sima, Image *ima, ImBuf *ibuf,
 	}
 }
 
-static void draw_render_info(Scene *scene, Image *ima, ARegion *ar)
+static void draw_render_info(Image *ima, ARegion *ar)
 {
-	RenderResult *rr;
 	rcti rect;
 	float colf[3];
+	int showspare= 0; // XXX BIF_show_render_spare();
 	
-	rr= BKE_image_acquire_renderresult(scene, ima);
-
-	if(rr->text) {
-		rect= ar->winrct;
-		rect.xmin= 0;
-		rect.ymin= ar->winrct.ymax - ar->winrct.ymin - HEADER_HEIGHT;
-		rect.xmax= ar->winrct.xmax - ar->winrct.xmin;
-		rect.ymax= ar->winrct.ymax - ar->winrct.ymin;
-		
-		/* clear header rect */
-		UI_GetThemeColor3fv(TH_BACK, colf);
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
-		glColor4f(colf[0]+0.1f, colf[1]+0.1f, colf[2]+0.1f, 0.5f);
-		glRecti(rect.xmin, rect.ymin, rect.xmax, rect.ymax+1);
-		glDisable(GL_BLEND);
-		
-		UI_ThemeColor(TH_TEXT_HI);
+	if(ima->render_text==NULL)
+		return;
+	
+	rect= ar->winrct;
+	rect.xmin= 0;
+	rect.ymin= ar->winrct.ymax - ar->winrct.ymin - HEADER_HEIGHT;
+	rect.xmax= ar->winrct.xmax - ar->winrct.xmin;
+	rect.ymax= ar->winrct.ymax - ar->winrct.ymin;
+	
+	/* clear header rect */
+	UI_GetThemeColor3fv(TH_BACK, colf);
+	glEnable(GL_BLEND);
+	glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
+	glColor4f(colf[0]+0.1f, colf[1]+0.1f, colf[2]+0.1f, 0.5f);
+	glRecti(rect.xmin, rect.ymin, rect.xmax, rect.ymax+1);
+	glDisable(GL_BLEND);
+	
+	UI_ThemeColor(TH_TEXT_HI);
 
-		UI_DrawString(12, rect.ymin + 5, rr->text);
+	if(showspare) {
+		UI_DrawString(12, rect.ymin + 5, "(Previous)");
+		UI_DrawString(72, rect.ymin + 5, ima->render_text);
 	}
-
-	BKE_image_release_renderresult(scene, ima);
+	else
+		UI_DrawString(12, rect.ymin + 5, ima->render_text);
 }
 
 void draw_image_info(ARegion *ar, int channels, int x, int y, char *cp, float *fp, int *zp, float *zpf)
@@ -654,7 +654,7 @@ void draw_image_main(SpaceImage *sima, ARegion *ar, Scene *scene)
 
 	/* render info */
 	if(ibuf && ima && show_render)
-		draw_render_info(scene, ima, ar);
+		draw_render_info(ima, ar);
 	
 	/* XXX integrate this code */
 #if 0
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index eb87b5656bf..b69b6a552a6 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1805,21 +1805,21 @@ static int cycle_render_slot_poll(bContext *C)
 
 static int cycle_render_slot_exec(bContext *C, wmOperator *op)
 {
-	Image *ima= CTX_data_edit_image(C);
-	int a, slot, cur= ima->render_slot;
+	Scene *scene= CTX_data_scene(C);
+	int a, slot, cur= RE_GetViewSlot();
 
-	for(a=1; a<IMA_MAX_RENDER_SLOT; a++) {
-		slot= (cur+a)%IMA_MAX_RENDER_SLOT;
+	for(a=1; a<RE_SLOT_MAX; a++) {
+		slot= (cur+a)%RE_SLOT_MAX;
 
-		if(ima->renders[slot] || slot == ima->last_render_slot) {
-			ima->render_slot= slot;
+		if(RE_GetRender(scene->id.name, slot)) {
+			RE_SetViewSlot(slot);
 			break;
 		}
 	}
 
-	if(a == IMA_MAX_RENDER_SLOT)
-		ima->render_slot= ((cur == 1)? 0: 1);
-	
+	if(a == RE_SLOT_MAX)
+		RE_SetViewSlot((cur == 1)? 0: 1);
+
 	WM_event_add_notifier(C, NC_IMAGE|ND_DRAW, NULL);
 
 	return OPERATOR_FINISHED;
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index 06c62cf0268..473f706f6f8 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -1661,7 +1661,7 @@ void node_read_renderlayers(SpaceNode *snode)
 void node_read_fullsamplelayers(SpaceNode *snode)
 {
 	Scene *curscene= NULL; // XXX
-	Render *re= RE_NewRender(curscene->id.name);
+	Render *re= RE_NewRender(curscene->id.name, RE_SLOT_VIEW);
 
 	WM_cursor_wait(1);