From 193e77cc673e6836525ab1a0bad0ff5491e04d23 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 19 May 2014 00:24:45 +1000 Subject: Fix T40201: Keyframe edits fail to update the viewport --- source/blender/editors/space_nla/nla_buttons.c | 2 +- source/blender/editors/space_nla/nla_channels.c | 16 ++++---- source/blender/editors/space_nla/nla_draw.c | 4 +- source/blender/editors/space_nla/nla_edit.c | 50 ++++++++++++------------- source/blender/editors/space_nla/nla_select.c | 10 ++--- 5 files changed, 41 insertions(+), 41 deletions(-) (limited to 'source/blender/editors/space_nla') diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 808bd622c0d..1090106d79f 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -174,7 +174,7 @@ bool nla_panel_context(const bContext *C, PointerRNA *adt_ptr, PointerRNA *nlt_p } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); return (found != 0); } diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index 3c8518cdb28..3a956c8e062 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -94,7 +94,7 @@ static int mouse_nla_channels(bAnimContext *ac, float x, int channel_index, shor if (G.debug & G_DEBUG) printf("Error: animation channel (index = %d) not found in mouse_anim_channels()\n", channel_index); - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); return 0; } @@ -322,7 +322,7 @@ static int mouse_nla_channels(bAnimContext *ac, float x, int channel_index, shor } /* free channels */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* return the notifier-flags set */ return notifierFlags; @@ -438,12 +438,12 @@ static int nlachannels_pushdown_exec(bContext *C, wmOperator *op) ale = BLI_findlink(&anim_data, channel_index); if (ale == NULL) { BKE_reportf(op->reports, RPT_ERROR, "No animation channel found at index %d", channel_index); - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); return OPERATOR_CANCELLED; } else if (ale->type != ANIMTYPE_NLAACTION) { BKE_reportf(op->reports, RPT_ERROR, "Animation channel at index %d is not a NLA 'Active Action' channel", channel_index); - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); return OPERATOR_CANCELLED; } @@ -451,7 +451,7 @@ static int nlachannels_pushdown_exec(bContext *C, wmOperator *op) adt = ale->adt; /* we don't need anything here anymore, so free it all */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); } /* double-check that we are free to push down here... */ @@ -539,7 +539,7 @@ bool nlaedit_add_tracks_existing(bAnimContext *ac, bool above_sel) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); return added; } @@ -572,7 +572,7 @@ bool nlaedit_add_tracks_empty(bAnimContext *ac) } /* cleanup */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); return added; } @@ -666,7 +666,7 @@ static int nlaedit_delete_tracks_exec(bContext *C, wmOperator *UNUSED(op)) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* set notifier that things have changed */ WM_event_add_notifier(C, NC_ANIMATION | ND_NLA | NA_EDITED, NULL); diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c index 943112624cd..ac8dca6e83a 100644 --- a/source/blender/editors/space_nla/nla_draw.c +++ b/source/blender/editors/space_nla/nla_draw.c @@ -613,7 +613,7 @@ void draw_nla_main_data(bAnimContext *ac, SpaceNla *snla, ARegion *ar) } /* free tempolary channels */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); } /* *********************************************** */ @@ -704,7 +704,7 @@ void draw_nla_channel_list(bContext *C, bAnimContext *ac, ARegion *ar) } /* free temporary channels */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); } /* *********************************************** */ diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index 93d0f7527ef..11674805a3e 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/source/blender/editors/space_nla/nla_edit.c @@ -93,7 +93,7 @@ void ED_nla_postop_refresh(bAnimContext *ac) } /* free temp memory */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); } /* *********************************************** */ @@ -136,7 +136,7 @@ static int nlaedit_enable_tweakmode_exec(bContext *C, wmOperator *op) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* if we managed to enter tweakmode on at least one AnimData block, * set the flag for this in the active scene and send notifiers @@ -200,7 +200,7 @@ bool nlaedit_disable_tweakmode(bAnimContext *ac) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* if we managed to enter tweakmode on at least one AnimData block, * set the flag for this in the active scene and send notifiers @@ -293,7 +293,7 @@ static void get_nlastrip_extents(bAnimContext *ac, float *min, float *max, const } /* free memory */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); } /* set default range if nothing happened */ @@ -406,7 +406,7 @@ static bool nla_channels_get_selected_extents(bAnimContext *ac, float *min, floa } /* free all temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); return (found != 0); } @@ -602,7 +602,7 @@ static int nlaedit_add_actionclip_exec(bContext *C, wmOperator *op) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* refresh auto strip properties */ ED_nla_postop_refresh(&ac); @@ -723,7 +723,7 @@ static int nlaedit_add_transition_exec(bContext *C, wmOperator *op) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* was anything added? */ if (done) { @@ -815,7 +815,7 @@ static int nlaedit_add_sound_exec(bContext *C, wmOperator *UNUSED(op)) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* refresh auto strip properties */ ED_nla_postop_refresh(&ac); @@ -880,7 +880,7 @@ static int nlaedit_add_meta_exec(bContext *C, wmOperator *UNUSED(op)) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* set notifier that things have changed */ WM_event_add_notifier(C, NC_ANIMATION | ND_NLA | NA_EDITED, NULL); @@ -932,7 +932,7 @@ static int nlaedit_remove_meta_exec(bContext *C, wmOperator *UNUSED(op)) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* set notifier that things have changed */ WM_event_add_notifier(C, NC_ANIMATION | ND_NLA | NA_EDITED, NULL); @@ -1019,7 +1019,7 @@ static int nlaedit_duplicate_exec(bContext *C, wmOperator *op) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); if (done) { /* refresh auto strip properties */ @@ -1111,7 +1111,7 @@ static int nlaedit_delete_exec(bContext *C, wmOperator *UNUSED(op)) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* refresh auto strip properties */ ED_nla_postop_refresh(&ac); @@ -1256,7 +1256,7 @@ static int nlaedit_split_exec(bContext *C, wmOperator *UNUSED(op)) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* refresh auto strip properties */ ED_nla_postop_refresh(&ac); @@ -1309,7 +1309,7 @@ static int nlaedit_bake_exec(bContext *C, wmOperator *UNUSED(op)) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* refresh auto strip properties */ ED_nla_postop_refresh(&ac); @@ -1375,7 +1375,7 @@ static int nlaedit_toggle_mute_exec(bContext *C, wmOperator *UNUSED(op)) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* set notifier that things have changed */ WM_event_add_notifier(C, NC_ANIMATION | ND_NLA | NA_EDITED, NULL); @@ -1529,7 +1529,7 @@ static int nlaedit_swap_exec(bContext *C, wmOperator *op) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* refresh auto strip properties */ ED_nla_postop_refresh(&ac); @@ -1603,7 +1603,7 @@ static int nlaedit_move_up_exec(bContext *C, wmOperator *UNUSED(op)) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* refresh auto strip properties */ ED_nla_postop_refresh(&ac); @@ -1677,7 +1677,7 @@ static int nlaedit_move_down_exec(bContext *C, wmOperator *UNUSED(op)) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* refresh auto strip properties */ ED_nla_postop_refresh(&ac); @@ -1756,7 +1756,7 @@ static int nlaedit_sync_actlen_exec(bContext *C, wmOperator *op) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* set notifier that things have changed */ WM_event_add_notifier(C, NC_ANIMATION | ND_NLA | NA_EDITED, NULL); @@ -1832,7 +1832,7 @@ static int nlaedit_make_single_user_exec(bContext *C, wmOperator *UNUSED(op)) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* set notifier that things have changed */ WM_event_add_notifier(C, NC_ANIMATION | ND_NLA | NA_EDITED, NULL); @@ -1928,7 +1928,7 @@ static int nlaedit_apply_scale_exec(bContext *C, wmOperator *UNUSED(op)) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* set notifier that things have changed */ WM_event_add_notifier(C, NC_ANIMATION | ND_NLA | NA_EDITED, NULL); @@ -1988,7 +1988,7 @@ static int nlaedit_clear_scale_exec(bContext *C, wmOperator *UNUSED(op)) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* refresh auto strip properties */ ED_nla_postop_refresh(&ac); @@ -2129,7 +2129,7 @@ static int nlaedit_snap_exec(bContext *C, wmOperator *op) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* refresh auto strip properties */ ED_nla_postop_refresh(&ac); @@ -2252,7 +2252,7 @@ static int nla_fmodifier_add_exec(bContext *C, wmOperator *op) } /* free temp data */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* set notifier that things have changed */ WM_event_add_notifier(C, NC_ANIMATION | ND_NLA | NA_EDITED, NULL); @@ -2375,7 +2375,7 @@ static int nla_fmodifier_paste_exec(bContext *C, wmOperator *op) } /* clean up */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); /* successful or not? */ if (ok) { diff --git a/source/blender/editors/space_nla/nla_select.c b/source/blender/editors/space_nla/nla_select.c index 3e7a6f4578c..0d26f374dd0 100644 --- a/source/blender/editors/space_nla/nla_select.c +++ b/source/blender/editors/space_nla/nla_select.c @@ -153,7 +153,7 @@ static void deselect_nla_strips(bAnimContext *ac, short test, short sel) } /* Cleanup */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); } /* ------------------- */ @@ -268,7 +268,7 @@ static void borderselect_nla_strips(bAnimContext *ac, rcti rect, short mode, sho } /* cleanup */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); } /* ------------------- */ @@ -412,7 +412,7 @@ static void nlaedit_select_leftright(bContext *C, bAnimContext *ac, short leftri } /* Cleanup */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); } /* ------------------- */ @@ -537,7 +537,7 @@ static void mouse_nla_strips(bContext *C, bAnimContext *ac, const int mval[2], s if (ale == NULL) { /* channel not found */ printf("Error: animation channel (index = %d) not found in mouse_nla_strips()\n", channel_index); - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); return; } else { @@ -556,7 +556,7 @@ static void mouse_nla_strips(bContext *C, bAnimContext *ac, const int mval[2], s BLI_remlink(&anim_data, ale); /* free list of channels, since it's not used anymore */ - BLI_freelistN(&anim_data); + ANIM_animdata_freelist(&anim_data); } /* if currently in tweakmode, exit tweakmode before changing selection states -- cgit v1.2.3