diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-04 16:14:57 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-04 19:40:33 +0300 |
| commit | 2bef8ca1b8e0e51f1e09216d2a42f7fc0b7d723a (patch) | |
| tree | 0ab791a7f2d371c9f203a82d78538ce16203e90f /source/blender/editors/space_image/space_image.c | |
| parent | 5a1aa5b935f036a0493badae8cb835d13265a5e1 (diff) | |
Cleanup: pass window to listeners, instead of screen + workspace.
Diffstat (limited to 'source/blender/editors/space_image/space_image.c')
| -rw-r--r-- | source/blender/editors/space_image/space_image.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 907b7e51c42..5c95d5944d1 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -434,8 +434,7 @@ static void image_refresh(const bContext *C, ScrArea *sa) } } -static void image_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *scene, - WorkSpace *workspace) +static void image_listener(wmWindow *win, ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene)) { SpaceImage *sima = (SpaceImage *)sa->spacedata.first; @@ -529,7 +528,7 @@ static void image_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Sc case ND_TRANSFORM: case ND_MODIFIER: { - ViewLayer *view_layer = BKE_view_layer_from_workspace_get(scene, workspace); + ViewLayer *view_layer = WM_window_get_active_view_layer(win); Object *ob = OBACT(view_layer); if (ob && (ob == wmn->reference) && (ob->mode & OB_MODE_EDIT)) { if (sima->lock && (sima->flag & SI_DRAWSHADOW)) { @@ -821,7 +820,7 @@ static void image_main_region_draw(const bContext *C, ARegion *ar) } static void image_main_region_listener( - bScreen *UNUSED(sc), ScrArea *sa, ARegion *ar, + wmWindow *UNUSED(win), ScrArea *sa, ARegion *ar, wmNotifier *wmn, const Scene *UNUSED(scene)) { /* context changes */ @@ -877,7 +876,7 @@ static void image_buttons_region_draw(const bContext *C, ARegion *ar) } static void image_buttons_region_listener( - bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, + wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn, const Scene *UNUSED(scene)) { /* context changes */ @@ -952,7 +951,7 @@ static void image_tools_region_draw(const bContext *C, ARegion *ar) } static void image_tools_region_listener( - bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, + wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn, const Scene *UNUSED(scene)) { /* context changes */ @@ -1020,7 +1019,7 @@ static void image_header_region_draw(const bContext *C, ARegion *ar) } static void image_header_region_listener( - bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, + wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn, const Scene *UNUSED(scene)) { /* context changes */ |