diff options
| author | Jacques Lucke <jacques@blender.org> | 2021-05-07 11:36:27 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2021-05-07 11:36:27 +0300 |
| commit | 619b015a46786a4f4057b0dd4d20d27b61d13c0f (patch) | |
| tree | bc6c5701becc47ae77e40e4f6c77365c06f2458c /source/blender/blenkernel/intern/anim_data.c | |
| parent | ab200c6eddc6494b5d95c98966969b2001d6db89 (diff) | |
| parent | 42e350b9a5fc32940b05fce4115ed76898862604 (diff) | |
Merge branch 'master' into profiler-editor
Diffstat (limited to 'source/blender/blenkernel/intern/anim_data.c')
| -rw-r--r-- | source/blender/blenkernel/intern/anim_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/anim_data.c b/source/blender/blenkernel/intern/anim_data.c index 447ed8fbe14..68de3e93a8e 100644 --- a/source/blender/blenkernel/intern/anim_data.c +++ b/source/blender/blenkernel/intern/anim_data.c @@ -354,7 +354,7 @@ AnimData *BKE_animdata_copy(Main *bmain, AnimData *adt, const int flag) } /* duplicate NLA data */ - BKE_nla_tracks_copy(bmain, &dadt->nla_tracks, &adt->nla_tracks, flag); + BKE_nla_tracks_copy_from_adt(bmain, dadt, adt, flag); /* duplicate drivers (F-Curves) */ BKE_fcurves_copy(&dadt->drivers, &adt->drivers); |