diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-03-10 09:29:45 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-03-18 13:44:20 +0300 |
| commit | 6ebd48f35317c084f7ea7787239727414df881b7 (patch) | |
| tree | 44e53367f406c3fc48a8b9ea7f647f5284c5c056 | |
| parent | 7268e6c58fe3a5b3c164a26fafaedf2af010a760 (diff) | |
Skip scopes update for render result during rendering
| -rw-r--r-- | source/blender/editors/space_image/image_edit.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c index ffbbcd6d722..8f2f6595408 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); } |