diff options
Diffstat (limited to 'source/blender/editors/space_nla')
-rw-r--r-- | source/blender/editors/space_nla/nla_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_nla/nla_edit.c | 28 | ||||
-rw-r--r-- | source/blender/editors/space_nla/space_nla.c | 41 |
3 files changed, 37 insertions, 34 deletions
diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c index d3c93f6a5b6..5a59ba6b553 100644 --- a/source/blender/editors/space_nla/nla_draw.c +++ b/source/blender/editors/space_nla/nla_draw.c @@ -828,7 +828,7 @@ void draw_nla_channel_list(const bContext *C, bAnimContext *ac, ARegion *region) /* need to do a view-sync here, so that the keys area doesn't jump around * (it must copy this) */ - UI_view2d_sync(NULL, ac->sa, v2d, V2D_LOCK_COPY); + UI_view2d_sync(NULL, ac->area, v2d, V2D_LOCK_COPY); /* draw channels */ { /* first pass: just the standard GL-drawing for backdrop + text */ diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index 2427001657a..5b949911158 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/source/blender/editors/space_nla/nla_edit.c @@ -1506,7 +1506,7 @@ static int nlaedit_swap_exec(bContext *C, wmOperator *op) NlaTrack *nlt = (NlaTrack *)ale->data; NlaStrip *strip, *stripN = NULL; - NlaStrip *sa = NULL, *sb = NULL; + NlaStrip *area = NULL, *sb = NULL; /* make temporary metastrips so that entire islands of selections can be moved around */ BKE_nlastrips_make_metas(&nlt->strips, 1); @@ -1533,9 +1533,9 @@ static int nlaedit_swap_exec(bContext *C, wmOperator *op) if (strip->flag & NLASTRIP_FLAG_SELECT) { /* first or second strip? */ - if (sa == NULL) { + if (area == NULL) { /* store as first */ - sa = strip; + area = strip; } else if (sb == NULL) { /* store as second */ @@ -1556,7 +1556,7 @@ static int nlaedit_swap_exec(bContext *C, wmOperator *op) "Too many clusters of strips selected in NLA Track (%s): needs exactly 2 to be selected", nlt->name); } - else if (sa == NULL) { + else if (area == NULL) { /* no warning as this is just a common case, * and it may get annoying when doing multiple tracks */ } @@ -1573,24 +1573,24 @@ static int nlaedit_swap_exec(bContext *C, wmOperator *op) /* remove these strips from the track, * so that we can test if they can fit in the proposed places */ - BLI_remlink(&nlt->strips, sa); + BLI_remlink(&nlt->strips, area); BLI_remlink(&nlt->strips, sb); /* calculate new extents for strips */ /* a --> b */ nsa[0] = sb->start; - nsa[1] = sb->start + (sa->end - sa->start); + nsa[1] = sb->start + (area->end - area->start); /* b --> a */ - nsb[0] = sa->start; - nsb[1] = sa->start + (sb->end - sb->start); + nsb[0] = area->start; + nsb[1] = area->start + (sb->end - sb->start); /* check if the track has room for the strips to be swapped */ if (BKE_nlastrips_has_space(&nlt->strips, nsa[0], nsa[1]) && BKE_nlastrips_has_space(&nlt->strips, nsb[0], nsb[1])) { /* set new extents for strips then */ - sa->start = nsa[0]; - sa->end = nsa[1]; - BKE_nlameta_flush_transforms(sa); + area->start = nsa[0]; + area->end = nsa[1]; + BKE_nlameta_flush_transforms(area); sb->start = nsb[0]; sb->end = nsb[1]; @@ -1598,7 +1598,7 @@ static int nlaedit_swap_exec(bContext *C, wmOperator *op) } else { /* not enough room to swap, so show message */ - if ((sa->flag & NLASTRIP_FLAG_TEMP_META) || (sb->flag & NLASTRIP_FLAG_TEMP_META)) { + if ((area->flag & NLASTRIP_FLAG_TEMP_META) || (sb->flag & NLASTRIP_FLAG_TEMP_META)) { BKE_report( op->reports, RPT_WARNING, @@ -1609,13 +1609,13 @@ static int nlaedit_swap_exec(bContext *C, wmOperator *op) RPT_WARNING, "Cannot swap '%s' and '%s' as one or both will not be able to fit in their " "new places", - sa->name, + area->name, sb->name); } } /* add strips back to track now */ - BKE_nlatrack_add_strip(nlt, sa); + BKE_nlatrack_add_strip(nlt, area); BKE_nlatrack_add_strip(nlt, sb); } diff --git a/source/blender/editors/space_nla/space_nla.c b/source/blender/editors/space_nla/space_nla.c index c4e1431ee26..f060693d9f4 100644 --- a/source/blender/editors/space_nla/space_nla.c +++ b/source/blender/editors/space_nla/space_nla.c @@ -57,7 +57,7 @@ /* ******************** default callbacks for nla space ***************** */ -static SpaceLink *nla_new(const ScrArea *sa, const Scene *scene) +static SpaceLink *nla_new(const ScrArea *area, const Scene *scene) { ARegion *region; SpaceNla *snla; @@ -105,7 +105,7 @@ static SpaceLink *nla_new(const ScrArea *sa, const Scene *scene) region->regiontype = RGN_TYPE_WINDOW; region->v2d.tot.xmin = (float)(SFRA - 10); - region->v2d.tot.ymin = (float)(-sa->winy) / 3.0f; + region->v2d.tot.ymin = (float)(-area->winy) / 3.0f; region->v2d.tot.xmax = (float)(EFRA + 10); region->v2d.tot.ymax = 0.0f; @@ -141,9 +141,9 @@ static void nla_free(SpaceLink *sl) } /* spacetype; init callback */ -static void nla_init(struct wmWindowManager *wm, ScrArea *sa) +static void nla_init(struct wmWindowManager *wm, ScrArea *area) { - SpaceNla *snla = (SpaceNla *)sa->spacedata.first; + SpaceNla *snla = (SpaceNla *)area->spacedata.first; /* init dopesheet data if non-existent (i.e. for old files) */ if (snla->ads == NULL) { @@ -151,7 +151,7 @@ static void nla_init(struct wmWindowManager *wm, ScrArea *sa) snla->ads->source = (ID *)WM_window_get_active_scene(wm->winactive); } - ED_area_tag_refresh(sa); + ED_area_tag_refresh(area); } static SpaceLink *nla_duplicate(SpaceLink *sl) @@ -325,7 +325,7 @@ static void nla_buttons_region_draw(const bContext *C, ARegion *region) } static void nla_region_listener(wmWindow *UNUSED(win), - ScrArea *UNUSED(sa), + ScrArea *UNUSED(area), ARegion *region, wmNotifier *wmn, const Scene *UNUSED(scene)) @@ -365,7 +365,7 @@ static void nla_region_listener(wmWindow *UNUSED(win), } static void nla_main_region_listener(wmWindow *UNUSED(win), - ScrArea *UNUSED(sa), + ScrArea *UNUSED(area), ARegion *region, wmNotifier *wmn, const Scene *UNUSED(scene)) @@ -427,12 +427,12 @@ static void nla_main_region_message_subscribe(const struct bContext *UNUSED(C), struct WorkSpace *UNUSED(workspace), struct Scene *scene, struct bScreen *screen, - struct ScrArea *sa, + struct ScrArea *area, struct ARegion *region, struct wmMsgBus *mbus) { PointerRNA ptr; - RNA_pointer_create(&screen->id, &RNA_SpaceNLA, sa->spacedata.first, &ptr); + RNA_pointer_create(&screen->id, &RNA_SpaceNLA, area->spacedata.first, &ptr); wmMsgSubscribeValue msg_sub_value_region_tag_redraw = { .owner = region, @@ -466,7 +466,7 @@ static void nla_main_region_message_subscribe(const struct bContext *UNUSED(C), } static void nla_channel_region_listener(wmWindow *UNUSED(win), - ScrArea *UNUSED(sa), + ScrArea *UNUSED(area), ARegion *region, wmNotifier *wmn, const Scene *UNUSED(scene)) @@ -512,12 +512,12 @@ static void nla_channel_region_message_subscribe(const struct bContext *UNUSED(C struct WorkSpace *UNUSED(workspace), struct Scene *UNUSED(scene), struct bScreen *screen, - struct ScrArea *sa, + struct ScrArea *area, struct ARegion *region, struct wmMsgBus *mbus) { PointerRNA ptr; - RNA_pointer_create(&screen->id, &RNA_SpaceNLA, sa->spacedata.first, &ptr); + RNA_pointer_create(&screen->id, &RNA_SpaceNLA, area->spacedata.first, &ptr); wmMsgSubscribeValue msg_sub_value_region_tag_redraw = { .owner = region, @@ -543,24 +543,27 @@ static void nla_channel_region_message_subscribe(const struct bContext *UNUSED(C } /* editor level listener */ -static void nla_listener(wmWindow *UNUSED(win), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene)) +static void nla_listener(wmWindow *UNUSED(win), + ScrArea *area, + wmNotifier *wmn, + Scene *UNUSED(scene)) { /* context changes */ switch (wmn->category) { case NC_ANIMATION: // TODO: filter specific types of changes? - ED_area_tag_refresh(sa); + ED_area_tag_refresh(area); break; case NC_SCENE: #if 0 switch (wmn->data) { case ND_OB_ACTIVE: case ND_OB_SELECT: - ED_area_tag_refresh(sa); + ED_area_tag_refresh(area); break; } #endif - ED_area_tag_refresh(sa); + ED_area_tag_refresh(area); break; case NC_OBJECT: switch (wmn->data) { @@ -568,19 +571,19 @@ static void nla_listener(wmWindow *UNUSED(win), ScrArea *sa, wmNotifier *wmn, Sc /* do nothing */ break; default: - ED_area_tag_refresh(sa); + ED_area_tag_refresh(area); break; } break; case NC_SPACE: if (wmn->data == ND_SPACE_NLA) { - ED_area_tag_redraw(sa); + ED_area_tag_redraw(area); } break; } } -static void nla_id_remap(ScrArea *UNUSED(sa), SpaceLink *slink, ID *old_id, ID *new_id) +static void nla_id_remap(ScrArea *UNUSED(area), SpaceLink *slink, ID *old_id, ID *new_id) { SpaceNla *snla = (SpaceNla *)slink; |