diff options
author | Joshua Leung <aligorith@gmail.com> | 2013-03-14 11:11:36 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2013-03-14 11:11:36 +0400 |
commit | 21dc93d275be257d9777d772a5325b6d704b1cb2 (patch) | |
tree | 0cfc83f640735b3df084921f26d6bf00aea57666 /source/blender/editors/space_nla/nla_channels.c | |
parent | 07f2efe82f0bbc2ee2772f6aa29f33cdac2b546e (diff) |
Quick fixes for previous commit
* Missing word in tooltip for operator
* Ensure that filters are set appropriately so that effect is visible
immediately
Diffstat (limited to 'source/blender/editors/space_nla/nla_channels.c')
-rw-r--r-- | source/blender/editors/space_nla/nla_channels.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index 8a9e26b354c..f9732a79a11 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -535,6 +535,20 @@ void NLA_OT_tracks_delete(wmOperatorType *ot) static int nlaedit_objects_add_exec(bContext *C, wmOperator *UNUSED(op)) { + bAnimContext ac; + SpaceNla *snla; + + /* get editor data */ + if (ANIM_animdata_get_context(C, &ac) == 0) + return OPERATOR_CANCELLED; + + /* ensure that filters are set so that the effect will be immediately visible */ + snla = (SpaceNla *)ac.sl; + if (snla && snla->ads) { + snla->ads->filterflag &= ~ADS_FILTER_NLA_NOACT; + } + + /* operate on selected objects... */ CTX_DATA_BEGIN (C, Object *, ob, selected_objects) { /* ensure that object has AnimData... that's all */ @@ -554,7 +568,7 @@ void NLA_OT_selected_objects_add(wmOperatorType *ot) /* identifiers */ ot->name = "Include Selected Objects"; ot->idname = "NLA_OT_selected_objects_add"; - ot->description = "Make selected objects in NLA Editor by adding Animation Data"; + ot->description = "Make selected objects appear in NLA Editor by adding Animation Data"; /* api callbacks */ ot->exec = nlaedit_objects_add_exec; |