diff options
author | Joshua Leung <aligorith@gmail.com> | 2010-02-01 14:45:24 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2010-02-01 14:45:24 +0300 |
commit | c8e8057ada8318688f9b520d3610456116a2eae2 (patch) | |
tree | ee506f7b3256f529d637abaffc37917664597d5d /source/blender/editors/space_graph | |
parent | c5ef38a415805d4d4609eb44a85cc0417b2fa7d5 (diff) |
Bugfix #19970: auto-clamped / auto working strangly in f-curve editor
Fixed the operators for DopeSheet/Graph Editors responsible for setting the "auto-clamped". This option is actually per F-Curve instead of per handle, and the code here should function like it did in 2.4x
However, despite this, it still appears to work oddly IMO. Any comments Bassam or animators familiar with the intentions of this?
Diffstat (limited to 'source/blender/editors/space_graph')
-rw-r--r-- | source/blender/editors/space_graph/graph_edit.c | 71 |
1 files changed, 48 insertions, 23 deletions
diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index fe06348c8ec..5e2e56abcc5 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -1361,6 +1361,18 @@ void GRAPH_OT_interpolation_type (wmOperatorType *ot) /* ******************** Set Handle-Type Operator *********************** */ +EnumPropertyItem graphkeys_handle_type_items[] = { + {0, "", 0, "For Selected Handles", ""}, + {HD_FREE, "FREE", 0, "Free", ""}, + {HD_AUTO, "AUTO", 0, "Auto", ""}, + {HD_VECT, "VECTOR", 0, "Vector", ""}, + {HD_ALIGN, "ALIGNED", 0, "Aligned", ""}, + {0, "", 0, "For Selected F-Curves", ""}, + {HD_AUTO_ANIM, "ANIM_CLAMPED", 0, "Auto Clamped", "Handles stay horizontal"}, + {0, NULL, 0, NULL, NULL}}; + +/* ------------------- */ + /* this function is responsible for setting handle-type of selected keyframes */ static void sethandles_graph_keys(bAnimContext *ac, short mode) { @@ -1370,32 +1382,42 @@ static void sethandles_graph_keys(bAnimContext *ac, short mode) BeztEditFunc set_cb= ANIM_editkeyframes_handles(mode); /* filter data */ - filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE| ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY); + filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY); ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype); /* loop through setting flags for handles * Note: we do not supply BeztEditData to the looper yet. Currently that's not necessary here... */ - // XXX we might need to supply BeztEditData to get it to only affect selected handles + for (ale= anim_data.first; ale; ale= ale->next) + ANIM_fcurve_keys_bezier_loop(NULL, ale->key_data, NULL, set_cb, calchandles_fcurve); + + /* cleanup */ + BLI_freelistN(&anim_data); +} + +/* this function is responsible for toggling clamped-handles */ +static void sethandles_clamped_graph_keys(bAnimContext *ac) +{ + ListBase anim_data = {NULL, NULL}; + bAnimListElem *ale; + int filter; + + /* filter data */ + filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY); + ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype); + + /* toggle auto-handles on the F-Curves, which forces handles to stay horizontal */ for (ale= anim_data.first; ale; ale= ale->next) { - if (mode == -1) { - BeztEditFunc toggle_cb; + FCurve *fcu= ale->data; + + /* only enable if curve is selected */ + if (SEL_FCU(fcu)) + fcu->flag |= FCURVE_AUTO_HANDLES; + else + fcu->flag &= ~FCURVE_AUTO_HANDLES; - /* check which type of handle to set (free or aligned) - * - check here checks for handles with free alignment already - */ - if (ANIM_fcurve_keys_bezier_loop(NULL, ale->key_data, NULL, set_cb, NULL)) - toggle_cb= ANIM_editkeyframes_handles(HD_FREE); - else - toggle_cb= ANIM_editkeyframes_handles(HD_ALIGN); - - /* set handle-type */ - ANIM_fcurve_keys_bezier_loop(NULL, ale->key_data, NULL, toggle_cb, calchandles_fcurve); - } - else { - /* directly set handle-type */ - ANIM_fcurve_keys_bezier_loop(NULL, ale->key_data, NULL, set_cb, calchandles_fcurve); - } + /* force handles to be recalculated */ + calchandles_fcurve(fcu); } /* cleanup */ @@ -1417,18 +1439,21 @@ static int graphkeys_handletype_exec(bContext *C, wmOperator *op) mode= RNA_enum_get(op->ptr, "type"); /* set handle type */ - sethandles_graph_keys(&ac, mode); + if (mode == HD_AUTO_ANIM) + sethandles_clamped_graph_keys(&ac); + else + sethandles_graph_keys(&ac, mode); /* validate keyframes after editing */ ANIM_editkeyframes_refresh(&ac); - /* set notifier that things have changed */ + /* set notifier that keyframe properties have changed */ WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_PROP, NULL); return OPERATOR_FINISHED; } -void GRAPH_OT_handle_type (wmOperatorType *ot) + void GRAPH_OT_handle_type (wmOperatorType *ot) { /* identifiers */ ot->name= "Set Keyframe Handle Type"; @@ -1444,7 +1469,7 @@ void GRAPH_OT_handle_type (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", beztriple_handle_type_items, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", graphkeys_handle_type_items, 0, "Type", ""); } /* ************************************************************************** */ |