[Bf-blender-cvs] [4e0aa0e] master: NLA Editor: Added dedicated operator for the pushdown operation
Joshua Leung
noreply at git.blender.org
Mon May 5 04:19:01 CEST 2014
Commit: 4e0aa0e7f23fae72c469262d4aab751fc6d642de
Author: Joshua Leung
Date: Mon May 5 13:59:36 2014 +1200
https://developer.blender.org/rB4e0aa0e7f23fae72c469262d4aab751fc6d642de
NLA Editor: Added dedicated operator for the pushdown operation
===================================================================
M source/blender/editors/animation/anim_channels_defines.c
M source/blender/editors/space_nla/nla_channels.c
M source/blender/editors/space_nla/nla_intern.h
M source/blender/editors/space_nla/nla_ops.c
===================================================================
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 4a94d04..746395c 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -3931,17 +3931,18 @@ void ANIM_channel_draw_widgets(bContext *C, bAnimContext *ac, bAnimListElem *ale
/* NLA Action "pushdown" */
if ((ale->type == ANIMTYPE_NLAACTION) && (ale->adt && ale->adt->action) && !(ale->adt->flag & ADT_NLA_EDIT_ON)) {
- //const char *opname = "NLA_OT_action_pushdown"; // XXX: this is the real one
- //const char *opname = "NLA_OT_channels_click";
+ uiBut *but;
+ PointerRNA *opptr_b;
- // FIXME: this needs to hook up to an operator
uiBlockSetEmboss(block, UI_EMBOSS);
offset += UI_UNIT_X;
- uiDefIconButO(block, BUT, "NLA_OT_channels_click", WM_OP_INVOKE_DEFAULT, ICON_NLA_PUSHDOWN,
- (int)v2d->cur.xmax - offset, ymid, UI_UNIT_X, UI_UNIT_X,
- "Push action on to the top of the NLA stack as a new NLA Strip");
- // TODO: pass channel index
+ but = uiDefIconButO(block, BUT, "NLA_OT_action_pushdown", WM_OP_INVOKE_DEFAULT, ICON_NLA_PUSHDOWN,
+ (int)v2d->cur.xmax - offset, ymid, UI_UNIT_X, UI_UNIT_X,
+ "Push action on to the top of the NLA stack as a new NLA Strip");
+
+ opptr_b = uiButGetOperatorPtrRNA(but);
+ RNA_int_set(opptr_b, "channel_index", channel_index);
uiBlockSetEmboss(block, UI_EMBOSSN);
}
diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c
index e50b025..06bf755 100644
--- a/source/blender/editors/space_nla/nla_channels.c
+++ b/source/blender/editors/space_nla/nla_channels.c
@@ -398,6 +398,87 @@ void NLA_OT_channels_click(wmOperatorType *ot)
/* *********************************************** */
/* Special Operators */
+/* ******************** Action Push Down ******************************** */
+
+static int nlachannels_pushdown_exec(bContext *C, wmOperator *op)
+{
+ bAnimContext ac;
+ AnimData *adt = NULL;
+ int channel_index = RNA_int_get(op->ptr, "channel_index");
+
+ /* get editor data */
+ if (ANIM_animdata_get_context(C, &ac) == 0)
+ return OPERATOR_CANCELLED;
+
+ /* get anim-channel to use (or more specifically, the animdata block behind it) */
+ if (channel_index == -1) {
+ /* active animdata block */
+ // FIXME
+ BKE_report(op->reports, RPT_WARNING, "Pushdown for active AnimData block is currently not yet implemented");
+ return OPERATOR_CANCELLED;
+ }
+ else {
+ /* indexed channel */
+ ListBase anim_data = {NULL, NULL};
+ bAnimListElem *ale;
+ int filter;
+
+ /* filter channels */
+ filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
+ ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
+
+ /* get channel from index */
+ 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);
+ 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);
+ return OPERATOR_CANCELLED;
+ }
+
+ /* grab AnimData from the channel */
+ adt = ale->adt;
+
+ /* we don't need anything here anymore, so free it all */
+ BLI_freelistN(&anim_data);
+ }
+
+ /* double-check that we are free to push down here... */
+ if (adt && nlaedit_is_tweakmode_on(&ac) == 0) {
+ /* 'push-down' action - only usable when not in TweakMode */
+ BKE_nla_action_pushdown(adt);
+ }
+
+ /* set notifier that things have changed */
+ WM_event_add_notifier(C, NC_ANIMATION | ND_NLA_ACTCHANGE, NULL);
+ return OPERATOR_FINISHED;
+}
+
+void NLA_OT_action_pushdown(wmOperatorType *ot)
+{
+ /* identifiers */
+ ot->name = "Push Down Action";
+ ot->idname = "NLA_OT_action_pushdown";
+ ot->description = "Push action down onto the top of the NLA stack as a new strip";
+
+ /* callbacks */
+ ot->exec = nlachannels_pushdown_exec;
+ ot->poll = nlaop_poll_tweakmode_off;
+
+ /* flags */
+ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+ /* properties */
+ ot->prop = RNA_def_int(ot->srna, "channel_index", -1, -1, INT_MAX, "Channel Index",
+ "Index of NLA action channel to perform pushdown operation on",
+ 0, INT_MAX);
+ RNA_def_property_flag(ot->prop, PROP_SKIP_SAVE);
+}
+
/* ******************** Add Tracks Operator ***************************** */
/* Add NLA Tracks to the same AnimData block as a selected track, or above the selected tracks */
diff --git a/source/blender/editors/space_nla/nla_intern.h b/source/blender/editors/space_nla/nla_intern.h
index ad1a4df..b89d816 100644
--- a/source/blender/editors/space_nla/nla_intern.h
+++ b/source/blender/editors/space_nla/nla_intern.h
@@ -134,6 +134,8 @@ bool nlaedit_add_tracks_empty(bAnimContext *ac);
void NLA_OT_channels_click(wmOperatorType *ot);
+void NLA_OT_action_pushdown(wmOperatorType *ot);
+
void NLA_OT_tracks_add(wmOperatorType *ot);
void NLA_OT_tracks_delete(wmOperatorType *ot);
diff --git a/source/blender/editors/space_nla/nla_ops.c b/source/blender/editors/space_nla/nla_ops.c
index 55658c8..295a7ab 100644
--- a/source/blender/editors/space_nla/nla_ops.c
+++ b/source/blender/editors/space_nla/nla_ops.c
@@ -117,6 +117,8 @@ void nla_operatortypes(void)
/* channels */
WM_operatortype_append(NLA_OT_channels_click);
+ WM_operatortype_append(NLA_OT_action_pushdown);
+
WM_operatortype_append(NLA_OT_tracks_add);
WM_operatortype_append(NLA_OT_tracks_delete);
More information about the Bf-blender-cvs
mailing list