diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 10:39:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 10:39:04 +0300 |
| commit | 95011f6d484b369db92ae13c674a6522d664ea8f (patch) | |
| tree | 91ba2719c9f3096fad0f1f768aa7b1c4d79aa32a /source/blender/editors/space_image/image_edit.c | |
| parent | 0911acb5cf49c5ba05b1df045b41697704aa288a (diff) | |
| parent | 44505b38df557a5711703613685a1dec9fc2c3d9 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_image/image_edit.c')
| -rw-r--r-- | source/blender/editors/space_image/image_edit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c index 19829517e00..0911bea3be4 100644 --- a/source/blender/editors/space_image/image_edit.c +++ b/source/blender/editors/space_image/image_edit.c @@ -323,7 +323,7 @@ void ED_space_image_scopes_update(const struct bContext *C, struct SpaceImage *s { Scene *scene = CTX_data_scene(C); Object *ob = CTX_data_active_object(C); - + /* scope update can be expensive, don't update during paint modes */ if (sima->mode == SI_MODE_PAINT) return; @@ -339,7 +339,7 @@ void ED_space_image_scopes_update(const struct bContext *C, struct SpaceImage *s return; } } - + scopes_update(&sima->scopes, ibuf, use_view_settings ? &scene->view_settings : NULL, &scene->display_settings); } |