Fix for bug #8324: J-key render buffer switching had various issues.

One problem was that the previous render buffer was stored in the
render window or image window itself, which means that when closing
it, or switching from one to the other, things didn't work as expected.
Also in the image editor, color sampling the previous render buffer or
saving it didn't work correct.

2 files changed, 10 insertions, 2 deletions

diff --git a/source/blender/include/BIF_drawimage.h b/source/blender/include/BIF_drawimage.h
index 44e40b8cabb..5ad1978a6e2 100644
--- a/source/blender/include/BIF_drawimage.h
+++ b/source/blender/include/BIF_drawimage.h
@@ -63,8 +63,6 @@ void imagespace_composite_flipbook(struct ScrArea *sa);
 
 void imagewindow_render_callbacks(struct Render *re);
 void imagewindow_toggle_render(void);
-void imagewindow_swap_render_rects(void);
-void imagewin_store_spare(void);
 struct ImBuf *imagewindow_get_ibuf(struct SpaceImage *sima);
 
 void image_editvertex_buts(struct uiBlock *block);
diff --git a/source/blender/include/BIF_renderwin.h b/source/blender/include/BIF_renderwin.h
index 789c3661db7..9bddafac701 100644
--- a/source/blender/include/BIF_renderwin.h
+++ b/source/blender/include/BIF_renderwin.h
@@ -33,6 +33,7 @@
 struct Render;
 struct ScrArea;
 struct RenderStats;
+struct ImBuf;
 
 void calc_renderwin_rectangle(int rectx, int recty, int posmask, int renderpos_r[2], int rendersize_r[2]);
 
@@ -40,6 +41,15 @@ void BIF_close_render_display(void);
 
 void BIF_do_render(int anim);
 
+/* render text */
+void BIF_make_render_text(struct RenderStats *rs);
+char *BIF_render_text(void);
+
+/* render spare buffer */
+int BIF_show_render_spare(void);
+struct ImBuf *BIF_render_spare_imbuf(void);
+void BIF_free_render_spare(void);
+
 /**
  * @param v3d The View3D space to render.
  */