Fix a few issues reported by coverity scan.

2 files changed, 4 insertions, 3 deletions

diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index 9d971bd5f3c..dc8bc2352d3 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -502,7 +502,8 @@ static void render_endjob(void *rjv)
 	 * engine API, so lets use simple and robust way for now
 	 *                                          - sergey -
 	 */
-	if (rj->scene->r.layers.first != rj->scene->r.layers.last) {
+	if (rj->scene->r.layers.first != rj->scene->r.layers.last ||
+	    rj->image_outdated) {
 		void *lock;
 		Image *ima = rj->image;
 		ImBuf *ibuf = BKE_image_acquire_ibuf(ima, &rj->iuser, &lock);
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c
index e85ed058262..982e9b1a410 100644
--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -1987,8 +1987,8 @@ void add_halo_flare(Render *re)
 			rr->renlay= rl;
 			re->display_draw(re->ddh, rr, NULL);
 		}
+
+		R.r.mode= mode;
 	}
-	
-	R.r.mode= mode;
 }