Revision: 26265
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26265
Author: aligorith
Date: 2010-01-26 00:11:01 +0100 (Tue, 26 Jan 2010)
Log Message:
-----------
Bugfix #20817: Graph Editor, Drivers: Driving a Shapekey by a bone rotation:
Unable to add modifiers
Wrong filters were used for F-Curves for adding the modifiers. Now the Graph
Editor curve visibility settings are only taken into account for this when the
hotkey version (i.e. only_active == False) is used, which means that the button
works again.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_action/action_edit.c
trunk/blender/source/blender/editors/space_graph/graph_edit.c
Modified: trunk/blender/source/blender/editors/space_action/action_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_action/action_edit.c
2010-01-25 22:47:43 UTC (rev 26264)
+++ trunk/blender/source/blender/editors/space_action/action_edit.c
2010-01-25 23:11:01 UTC (rev 26265)
@@ -1277,7 +1277,7 @@
/* defines for mirror keyframes tool */
EnumPropertyItem prop_actkeys_mirror_types[] = {
{ACTKEYS_MIRROR_CFRA, "CFRA", 0, "By Times over Current frame", ""},
- {ACTKEYS_MIRROR_YAXIS, "YAXIS", 0, "By Times over Time=0", ""},
+ {ACTKEYS_MIRROR_YAXIS, "YAXIS", 0, "By Times over Time=0", ""}, // XXX
this is probably better suited to the graph editor only, where we can see the
effects
{ACTKEYS_MIRROR_XAXIS, "XAXIS", 0, "By Values over Value=0", ""},
{ACTKEYS_MIRROR_MARKER, "MARKER", 0, "By Times over First Selected
Marker", ""},
{0, NULL, 0, NULL, NULL}
Modified: trunk/blender/source/blender/editors/space_graph/graph_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/graph_edit.c
2010-01-25 22:47:43 UTC (rev 26264)
+++ trunk/blender/source/blender/editors/space_graph/graph_edit.c
2010-01-25 23:11:01 UTC (rev 26265)
@@ -1923,11 +1923,11 @@
type= RNA_enum_get(op->ptr, "type");
/* filter data */
- filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE|
ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY);
+ filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT |
ANIMFILTER_CURVESONLY);
if (RNA_boolean_get(op->ptr, "only_active"))
filter |= ANIMFILTER_ACTIVE;
else
- filter |= ANIMFILTER_SEL;
+ filter |= (ANIMFILTER_SEL|ANIMFILTER_CURVEVISIBLE);
ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
/* smooth keyframes */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
