diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-26 13:16:47 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-26 13:16:47 +0300 |
commit | ce3b78c73a7ccc16fdccf7decedb5d1578dfdf0a (patch) | |
tree | 87f1a9c41ebe6f74806f1ae76206f1d328c85700 /source/blender/editors/space_image/image_edit.c | |
parent | 5279d118c2ddee0e6fef66aaf78452c1b302dd42 (diff) |
Cleanup: style, use braces for editor/spaces
Diffstat (limited to 'source/blender/editors/space_image/image_edit.c')
-rw-r--r-- | source/blender/editors/space_image/image_edit.c | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c index c8edccb0472..c838c6a87fe 100644 --- a/source/blender/editors/space_image/image_edit.c +++ b/source/blender/editors/space_image/image_edit.c @@ -74,13 +74,15 @@ void ED_space_image_set(Main *bmain, SpaceImage *sima, Object *obedit, Image *im } } - if (sima->image) + if (sima->image) { BKE_image_signal(bmain, sima->image, &sima->iuser, IMA_SIGNAL_USER_NEW_IMAGE); + } id_us_ensure_real((ID *)sima->image); - if (obedit) + if (obedit) { WM_main_add_notifier(NC_GEOM | ND_DATA, obedit->data); + } WM_main_add_notifier(NC_SPACE | ND_SPACE_IMAGE, NULL); } @@ -147,22 +149,25 @@ ImBuf *ED_space_image_acquire_buffer(SpaceImage *sima, void **r_lock) ibuf = BKE_image_acquire_ibuf(sima->image, &sima->iuser, r_lock); if (ibuf) { - if (ibuf->rect || ibuf->rect_float) + if (ibuf->rect || ibuf->rect_float) { return ibuf; + } BKE_image_release_ibuf(sima->image, ibuf, *r_lock); *r_lock = NULL; } } - else + else { *r_lock = NULL; + } return NULL; } void ED_space_image_release_buffer(SpaceImage *sima, ImBuf *ibuf, void *lock) { - if (sima && sima->image) + if (sima && sima->image) { BKE_image_release_ibuf(sima->image, ibuf, lock); + } } bool ED_space_image_has_buffer(SpaceImage *sima) @@ -335,7 +340,9 @@ bool ED_image_slot_cycle(struct Image *image, int direction) int num_slots = BLI_listbase_count(&image->renderslots); for (i = 1; i < num_slots; i++) { slot = (cur + ((direction == -1) ? -i : i)) % num_slots; - if (slot < 0) slot += num_slots; + if (slot < 0) { + slot += num_slots; + } RenderSlot *render_slot = BKE_image_get_renderslot(image, slot); if ((render_slot && render_slot->render) || slot == image->last_render_slot) { @@ -357,10 +364,12 @@ void ED_space_image_scopes_update(const struct bContext *C, struct SpaceImage *s Object *ob = CTX_data_active_object(C); /* scope update can be expensive, don't update during paint modes */ - if (sima->mode == SI_MODE_PAINT) + if (sima->mode == SI_MODE_PAINT) { return; - if (ob && ((ob->mode & (OB_MODE_TEXTURE_PAINT | OB_MODE_EDIT)) != 0)) + } + 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) { @@ -382,8 +391,9 @@ bool ED_space_image_show_render(SpaceImage *sima) bool ED_space_image_show_paint(SpaceImage *sima) { - if (ED_space_image_show_render(sima)) + if (ED_space_image_show_render(sima)) { return false; + } return (sima->mode == SI_MODE_PAINT); } @@ -442,8 +452,9 @@ bool ED_space_image_paint_curve(const bContext *C) if (sima && sima->mode == SI_MODE_PAINT) { Brush *br = CTX_data_tool_settings(C)->imapaint.paint.brush; - if (br && (br->flag & BRUSH_CURVE)) + if (br && (br->flag & BRUSH_CURVE)) { return true; + } } return false; |