Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/BKE_mesh.h
	source/blender/blenkernel/intern/mesh_convert.c
	source/blender/editors/interface/interface_eyedropper_color.c
	source/blender/editors/object/object_add.c
	source/blender/editors/space_image/image_ops.c
	source/blender/makesrna/intern/rna_image.c
	source/blender/windowmanager/intern/wm_draw.c

3 files changed, 10 insertions, 8 deletions

diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index ad546b6c2d3..d990f0b34d0 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -332,8 +332,8 @@ static int screen_render_exec(bContext *C, wmOperator *op)
 	G.is_break = false;
 	RE_test_break_cb(re, NULL, render_break);
 
-	ima = BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result");
-	BKE_image_signal(ima, NULL, IMA_SIGNAL_FREE);
+	ima = BKE_image_verify_viewer(mainp, IMA_TYPE_R_RESULT, "Render Result");
+	BKE_image_signal(mainp, ima, NULL, IMA_SIGNAL_FREE);
 	BKE_image_backup_render(scene, ima, true);
 
 	/* cleanup sequencer caches before starting user triggered render.
@@ -570,7 +570,7 @@ static void image_rect_update(void *rjv, RenderResult *rr, volatile rcti *renrec
 	else if (rj->image_outdated) {
 		/* update entire render */
 		rj->image_outdated = false;
-		BKE_image_signal(ima, NULL, IMA_SIGNAL_COLORMANAGE);
+		BKE_image_signal(rj->main, ima, NULL, IMA_SIGNAL_COLORMANAGE);
 		*(rj->do_update) = true;
 		return;
 	}
@@ -1002,8 +1002,8 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even
 	WM_jobs_callbacks(wm_job, render_startjob, NULL, NULL, render_endjob);
 
 	/* 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);
+	ima = BKE_image_verify_viewer(bmain, IMA_TYPE_R_RESULT, "Render Result");
+	BKE_image_signal(rj->main, ima, NULL, IMA_SIGNAL_FREE);
 	BKE_image_backup_render(rj->scene, ima, true);
 	rj->image = ima;
 
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index 7e33549c5ac..fb007accaeb 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -705,8 +705,8 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op)
 	oglrender->re = RE_NewSceneRender(scene);
 
 	/* create image and image user */
-	oglrender->ima = BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result");
-	BKE_image_signal(oglrender->ima, NULL, IMA_SIGNAL_FREE);
+	oglrender->ima = BKE_image_verify_viewer(oglrender->bmain, IMA_TYPE_R_RESULT, "Render Result");
+	BKE_image_signal(oglrender->bmain, oglrender->ima, NULL, IMA_SIGNAL_FREE);
 	BKE_image_backup_render(oglrender->scene, oglrender->ima, true);
 
 	oglrender->iuser.scene = scene;
diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c
index a522817825a..351ceda90e3 100644
--- a/source/blender/editors/render/render_view.c
+++ b/source/blender/editors/render/render_view.c
@@ -37,6 +37,7 @@
 #include "BKE_context.h"
 #include "BKE_image.h"
 #include "BKE_global.h"
+#include "BKE_main.h"
 #include "BKE_screen.h"
 #include "BKE_report.h"
 
@@ -131,6 +132,7 @@ static ScrArea *find_area_image_empty(bContext *C)
 /* new window uses x,y to set position */
 ScrArea *render_view_open(bContext *C, int mx, int my, ReportList *reports)
 {
+	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 	wmWindow *win = NULL;
 	ScrArea *sa = NULL;
@@ -213,7 +215,7 @@ ScrArea *render_view_open(bContext *C, int mx, int my, ReportList *reports)
 	sima = sa->spacedata.first;
 
 	/* get the correct image, and scale it */
-	sima->image = BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result");
+	sima->image = BKE_image_verify_viewer(bmain, IMA_TYPE_R_RESULT, "Render Result");
 
 
 	/* if we're rendering to full screen, set appropriate hints on image editor