diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-04 02:33:45 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-04 02:33:45 +0400 |
| commit | 28ab27a49a7c34a46fecb31547e7fadf001ead5b (patch) | |
| tree | f5d9fa0504ff860b83704361934724bcfc22f339 /source/blender/editors/space_image/image_edit.c | |
| parent | 6972e19fd55470700618174bbba5893d53b1deaa (diff) | |
allow editing masks in an image space when there is no image.
also simplify image listener.
Diffstat (limited to 'source/blender/editors/space_image/image_edit.c')
| -rw-r--r-- | source/blender/editors/space_image/image_edit.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c index c0b6dc656c2..58e6a1aa94a 100644 --- a/source/blender/editors/space_image/image_edit.c +++ b/source/blender/editors/space_image/image_edit.c @@ -371,7 +371,7 @@ int ED_space_image_maskedit_poll(bContext *C) { SpaceImage *sima = CTX_wm_space_image(C); - if (sima && sima->image) { + if (sima) { Scene *scene = CTX_data_scene(C); return ED_space_image_check_show_maskedit(scene, sima); } @@ -382,13 +382,8 @@ int ED_space_image_maskedit_poll(bContext *C) int ED_space_image_maskedit_mask_poll(bContext *C) { if (ED_space_image_maskedit_poll(C)) { - Image *ima = CTX_data_edit_image(C); - - if (ima) { - SpaceImage *sima = CTX_wm_space_image(C); - - return sima->mask_info.mask != NULL; - } + SpaceImage *sima = CTX_wm_space_image(C); + return sima->mask_info.mask != NULL; } return FALSE; |