diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-09-28 13:30:39 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-09-28 13:30:39 +0300 |
| commit | d525a541a2bf8913fce43e2f9bef3e37dba00d30 (patch) | |
| tree | f2758c9fd14a2234c29d7130d1f776c3b88f4bbb /source/blender/editors/animation/keyframing.c | |
| parent | e204f67cf0f570a69e46cf3eb731f2705c21ee46 (diff) | |
| parent | f808f2a4950a99f74780ea87e9d62ee36bc4ff35 (diff) | |
Merge branch 'master' into mesh-to-volume-modifier
Diffstat (limited to 'source/blender/editors/animation/keyframing.c')
| -rw-r--r-- | source/blender/editors/animation/keyframing.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index fb4c0ae0758..3701e9dc91c 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -162,7 +162,7 @@ bAction *ED_id_action_ensure(Main *bmain, ID *id) * so that users can't accidentally break actions by assigning them * to the wrong places */ - adt->action->idroot = GS(id->name); + BKE_animdata_action_ensure_idroot(id, adt->action); /* Tag depsgraph to be rebuilt to include time dependency. */ DEG_relations_tag_update(bmain); |