blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 759 Projects 19 Wiki Activity

Merge branch 'blender-v2.90-release'

This commit is contained in:
Philipp Oeser 2020-08-12 15:34:18 +02:00
parent d6570fcaed 08286ef8ba
commit 6ef58099d4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/animation/keyframing.c
View File

@ -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;

3
source/blender/editors/interface/interface_anim.c
View File

@ -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)