[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55268] trunk/blender/source/blender/ editors/space_nla/nla_channels.c: Quick fixes for previous commit
Joshua Leung
aligorith at gmail.com
Thu Mar 14 08:11:36 CET 2013
Revision: 55268
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55268
Author: aligorith
Date: 2013-03-14 07:11:36 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
Quick fixes for previous commit
* Missing word in tooltip for operator
* Ensure that filters are set appropriately so that effect is visible
immediately
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_nla/nla_channels.c
Modified: trunk/blender/source/blender/editors/space_nla/nla_channels.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_channels.c 2013-03-14 06:34:02 UTC (rev 55267)
+++ trunk/blender/source/blender/editors/space_nla/nla_channels.c 2013-03-14 07:11:36 UTC (rev 55268)
@@ -535,6 +535,20 @@
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 @@
/* 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;
More information about the Bf-blender-cvs
mailing list