Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/space_image/space_image.c')
-rw-r--r--source/blender/editors/space_image/space_image.c36
1 files changed, 22 insertions, 14 deletions
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index 79cc1eba898..f97813d3dd3 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -430,22 +430,28 @@ static void image_listener(ScrArea *sa, wmNotifier *wmn)
}
break;
case NC_MASK:
- switch (wmn->data) {
- case ND_SELECT:
- case ND_DATA:
- case ND_DRAW:
- ED_area_tag_redraw(sa);
- break;
- }
- switch (wmn->action) {
- case NA_SELECTED:
- ED_area_tag_redraw(sa);
- break;
- case NA_EDITED:
- ED_area_tag_redraw(sa);
- break;
+ {
+ // Scene *scene = wmn->window->screen->scene;
+ /* ideally would check for: ED_space_image_check_show_maskedit(scene, sima) but we cant get the scene */
+ if (sima->mode == SI_MODE_MASK) {
+ switch (wmn->data) {
+ case ND_SELECT:
+ case ND_DATA:
+ case ND_DRAW:
+ ED_area_tag_redraw(sa);
+ break;
+ }
+ switch (wmn->action) {
+ case NA_SELECTED:
+ ED_area_tag_redraw(sa);
+ break;
+ case NA_EDITED:
+ ED_area_tag_redraw(sa);
+ break;
+ }
}
break;
+ }
case NC_GEOM:
switch (wmn->data) {
case ND_DATA:
@@ -643,6 +649,8 @@ static void image_main_area_draw(const bContext *C, ARegion *ar)
TRUE, FALSE,
NULL, C);
+ ED_mask_draw_frames(mask, ar, CFRA, mask->sfra, mask->efra);
+
draw_image_cursor(sima, ar);
}