Render Slots: change the implementation by moving it from the render to the

image code, this should be clearer and makes reusing the Render struct later
on easier.

1 files changed, 6 insertions, 15 deletions

diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h
index f9c4e9690a1..dafed36d8e5 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -129,6 +129,9 @@ typedef struct RenderResult {
 	
 	/* for render results in Image, verify validity for sequences */
 	int framenr;
+
+	/* render info text */
+	char *text;
 	
 } RenderResult;
 
@@ -146,21 +149,8 @@ typedef struct RenderStats {
 
 /* the name is used as identifier, so elsewhere in blender the result can retrieved */
 /* calling a new render with same name, frees automatic existing render */
-struct Render *RE_NewRender (const char *name, int slot);
-struct Render *RE_GetRender(const char *name, int slot);
-
-/* render slots. for most cases like baking or preview render this will
-   always be default, for actual render multiple slots can be used. in
-   that case 'rendering' is the slot being rendered to, and 'view' is the
-   slot being viewed. these are always the same except if the currently
-   viewed slot is changed during render, at the end they will be synced. */
-#define RE_SLOT_RENDERING	-2
-#define RE_SLOT_VIEW		-1
-#define RE_SLOT_DEFAULT		 0
-#define RE_SLOT_MAX			10
-
-void RE_SetViewSlot(int slot);
-int RE_GetViewSlot(void);
+struct Render *RE_NewRender (const char *name);
+struct Render *RE_GetRender(const char *name);
 
 /* returns 1 while render is working (or renders called from within render) */
 int RE_RenderInProgress(struct Render *re);
@@ -175,6 +165,7 @@ void RE_FreeRenderResult(struct RenderResult *rr);
 struct RenderResult *RE_AcquireResultRead(struct Render *re);
 struct RenderResult *RE_AcquireResultWrite(struct Render *re);
 void RE_ReleaseResult(struct Render *re);
+void RE_SwapResult(struct Render *re, struct RenderResult **rr);
 void RE_AcquireResultImage(struct Render *re, struct RenderResult *rr);
 void RE_ReleaseResultImage(struct Render *re);
 struct RenderStats *RE_GetStats(struct Render *re);