[Bf-blender-cvs] [9b3b0a5] master: Skip scopes update for render result during rendering

[Sergey Sharybin]

Commit: 9b3b0a58735481e1b5a20c685e343a59d6796e80
Author: Sergey Sharybin
Date:   Thu Mar 10 11:29:45 2016 +0500
Branches: master
https://developer.blender.org/rB9b3b0a58735481e1b5a20c685e343a59d6796e80

Skip scopes update for render result during rendering

===================================================================

M	source/blender/editors/space_image/image_edit.c

===================================================================

diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c
index ffbbcd6..8f2f659 100644
--- a/source/blender/editors/space_image/image_edit.c
+++ b/source/blender/editors/space_image/image_edit.c
@@ -329,6 +329,16 @@ void ED_space_image_scopes_update(const struct bContext *C, struct SpaceImage *s
 		return;
 	if (ob && ((ob->mode & (OB_MODE_TEXTURE_PAINT | OB_MODE_EDIT)) != 0))
 		return;
+
+	/* We also don't update scopes of render result during render. */
+	if (G.is_rendering) {
+		const Image *image = sima->image;
+		if (image != NULL &&
+		    (image->type == IMA_TYPE_R_RESULT || image->type == IMA_TYPE_COMPOSITE))
+		{
+			return;
+		}
+	}
 	
 	scopes_update(&sima->scopes, ibuf, use_view_settings ? &scene->view_settings : NULL, &scene->display_settings);
 }