diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-08-12 16:34:18 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-08-12 16:34:18 +0300 |
| commit | 6ef58099d4311e158c0b3e2eae55759432865939 (patch) | |
| tree | 74ef76c1eb3aa3e39fc28d5e40631832792c8b71 | |
| parent | d6570fcaede9e1b33e50dfbb8c1b074bd9b660c2 (diff) | |
| parent | 08286ef8ba5c880fd9761b397d00ac81e993a657 (diff) | |
Merge branch 'blender-v2.90-release'
| -rw-r--r-- | source/blender/editors/animation/keyframing.c | 5 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_anim.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index 8c2f4216aa9..66d4882cf9d 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -3025,8 +3025,11 @@ bool ED_autokeyframe_property( bool special; bool changed = false; + /* for entire array buttons we check the first component, it's not perfect + * but works well enough in typical cases */ + const int rnaindex_check = (rnaindex == -1) ? 0 : rnaindex; fcu = BKE_fcurve_find_by_rna_context_ui( - C, ptr, prop, rnaindex, NULL, &action, &driven, &special); + C, ptr, prop, rnaindex_check, NULL, &action, &driven, &special); if (fcu == NULL) { return changed; diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c index cc58082cb02..56df49981e0 100644 --- a/source/blender/editors/interface/interface_anim.c +++ b/source/blender/editors/interface/interface_anim.c @@ -312,8 +312,7 @@ bool ui_but_anim_expression_create(uiBut *but, const char *str) void ui_but_anim_autokey(bContext *C, uiBut *but, Scene *scene, float cfra) { - const int rnaindex = (but->rnaindex == -1) ? 0 : but->rnaindex; - ED_autokeyframe_property(C, scene, &but->rnapoin, but->rnaprop, rnaindex, cfra); + ED_autokeyframe_property(C, scene, &but->rnapoin, but->rnaprop, but->rnaindex, cfra); } void ui_but_anim_copy_driver(bContext *C) |