[Bf-blender-cvs] [6ebd48f] blender-v2.77-release: Skip scopes update for render result during rendering

[Sergey Sharybin]

Commit: 6ebd48f35317c084f7ea7787239727414df881b7
Author: Sergey Sharybin
Date:   Thu Mar 10 11:29:45 2016 +0500
Branches: blender-v2.77-release
https://developer.blender.org/rB6ebd48f35317c084f7ea7787239727414df881b7

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);
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs