Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Skip scopes update for render result during rendering

Browse Source
This commit is contained in:
Sergey Sharybin
2016-03-10 11:29:45 +05:00
parent f65c08c56c
commit 9b3b0a5873
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/space_image/image_edit.c
View File

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