diff options
| author | Joshua Leung <aligorith@gmail.com> | 2010-01-26 13:29:10 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2010-01-26 13:29:10 +0300 |
| commit | e03bbf12c356c6f1f29095826293b3a074d77042 (patch) | |
| tree | f16e31f741ec9cb1547877df60a74979d99f136c /source | |
| parent | 4e92b694111b811d9eae130a76a6d8861b3ddc1c (diff) | |
Assorted Bugfixes:
* Adding new Keying Set paths didn't initialise the id-type setting. Make this default to Object
* Fixed bad poll callbacks for Graph Editor operators working on keyframes, which were expecting F-Curves to be selected too to be eligible for editing. This was often too restrictive, resulting in nothing happening.
* Fixed error with default property for Debug Redraw-Timer Operator not being set. However, this operator is currently still no use, since the info popups are now disabled.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/animation/keyingsets.c | 7 | ||||
| -rw-r--r-- | source/blender/editors/space_graph/graph_utils.c | 4 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index d5624b8bc5b..9d21eded9c7 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -227,6 +227,7 @@ static int add_empty_ks_path_exec (bContext *C, wmOperator *op) ks->active_path= BLI_countlist(&ks->paths); ksp->groupmode= KSP_GROUP_KSNAME; // XXX? + ksp->idtype= ID_OB; return OPERATOR_FINISHED; } @@ -320,10 +321,8 @@ static int add_keyingset_button_exec (bContext *C, wmOperator *op) */ flag |= KEYINGSET_ABSOLUTE; - if (IS_AUTOKEY_FLAG(AUTOMATKEY)) - keyingflag |= INSERTKEY_MATRIX; - if (IS_AUTOKEY_FLAG(INSERTNEEDED)) - keyingflag |= INSERTKEY_NEEDED; + keyingflag |= ANIM_get_keyframing_flags(scene, 0); + if (IS_AUTOKEY_FLAG(XYZ2RGB)) keyingflag |= INSERTKEY_XYZ2RGB; diff --git a/source/blender/editors/space_graph/graph_utils.c b/source/blender/editors/space_graph/graph_utils.c index 40fe3393a60..f642b284491 100644 --- a/source/blender/editors/space_graph/graph_utils.c +++ b/source/blender/editors/space_graph/graph_utils.c @@ -224,10 +224,10 @@ int graphop_editable_keyframes_poll (bContext *C) if (ANIM_animdata_get_context(C, &ac) == 0) return 0; - /* loop over the editable (selected + editable) F-Curves, and see if they're suitable + /* loop over the editable F-Curves, and see if they're suitable * stopping on the first successful match */ - filter= (ANIMFILTER_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY); + filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY); items = ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype); if (items == 0) return 0; diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 40b9714a6e1..04d6a5b2325 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2661,7 +2661,7 @@ static void WM_OT_redraw_timer(wmOperatorType *ot) ot->exec= redraw_timer_exec; ot->poll= WM_operator_winactive; - RNA_def_enum(ot->srna, "type", prop_type_items, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_type_items, 0, "Type", ""); RNA_def_int(ot->srna, "iterations", 10, 1,INT_MAX, "Iterations", "Number of times to redraw", 1,1000); } |