diff options
| author | Joshua Leung <aligorith@gmail.com> | 2013-03-16 09:58:59 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2013-03-16 09:58:59 +0400 |
| commit | 31356c86d3890d21e7845cd29d25ed4df28e65f3 (patch) | |
| tree | 32c95ee6831ce3a8f94b4dc52778549db56fb465 | |
| parent | 9aa4396a9732b0acc678d7eb309452d817493279 (diff) | |
Some more assorted fixes
* More duplicate/wrong comments (copy+paste errors)
* Brough Calculate/Clear Motion Path UI for bones more in line with the Object
version
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 5 | ||||
| -rw-r--r-- | source/blender/editors/space_nla/nla_channels.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/space_nla/nla_edit.c | 8 |
3 files changed, 9 insertions, 7 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 8fb48f96073..2e98cb68eb5 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -472,8 +472,9 @@ class VIEW3D_PT_tools_posemode(View3DPanel, Panel): col = layout.column(align=True) col.label(text="Motion Paths:") - col.operator("pose.paths_calculate", text="Calculate Paths") - col.operator("pose.paths_clear", text="Clear Paths") + row = col.row(align=True) + row.operator("pose.paths_calculate", text="Calculate") + row.operator("pose.paths_clear", text="Clear") draw_repeat_tools(context, layout) diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index a4b036bf00f..177a781bcc2 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -469,7 +469,8 @@ static bool nlaedit_add_tracks_empty(bAnimContext *ac) return added; } -/* Add Tracks exec() */ +/* ----- */ + static int nlaedit_add_tracks_exec(bContext *C, wmOperator *op) { bAnimContext ac; diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index d337c3236c5..17d403789cf 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/source/blender/editors/space_nla/nla_edit.c @@ -1627,7 +1627,7 @@ void NLA_OT_action_sync_length(wmOperatorType *ot) /* api callbacks */ ot->exec = nlaedit_sync_actlen_exec; - ot->poll = ED_operator_nla_active; // XXX: is this satisfactory... probably requires a check for active strip... + ot->poll = nlaop_poll_tweakmode_off; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; @@ -2102,8 +2102,10 @@ static int nla_fmodifier_copy_exec(bContext *C, wmOperator *op) BKE_report(op->reports, RPT_ERROR, "No F-Modifiers available to be copied"); return OPERATOR_CANCELLED; } - else + else { + /* no updates needed - copy is non-destructive operation */ return OPERATOR_FINISHED; + } } void NLA_OT_fmodifier_copy(wmOperatorType *ot) @@ -2157,8 +2159,6 @@ static int nla_fmodifier_paste_exec(bContext *C, wmOperator *op) /* successful or not? */ if (ok) { - /* set notifier that things have changed */ - /* set notifier that things have changed */ WM_event_add_notifier(C, NC_ANIMATION | ND_NLA | NA_EDITED, NULL); return OPERATOR_FINISHED; } |