diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-12 12:21:54 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-12 12:21:54 +0300 |
| commit | 75bcb70c60172e61d2e564c88f78843d617eb919 (patch) | |
| tree | 4a5efb9835fe0983a077b92ee995dbdce9fe4870 /source/blender/blenkernel/intern/anim_sys.c | |
| parent | 7bf40236893c199a13b51fd3ea3351956abd197a (diff) | |
Cleanup: remove some G.main from BKE area.
Diffstat (limited to 'source/blender/blenkernel/intern/anim_sys.c')
| -rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 924b1951d37..b94bce9baee 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -284,7 +284,7 @@ AnimData *BKE_animdata_copy(Main *bmain, AnimData *adt, const bool do_action) } /* duplicate NLA data */ - BKE_nla_tracks_copy(&dadt->nla_tracks, &adt->nla_tracks); + BKE_nla_tracks_copy(bmain, &dadt->nla_tracks, &adt->nla_tracks); /* duplicate drivers (F-Curves) */ copy_fcurves(&dadt->drivers, &adt->drivers); @@ -366,7 +366,7 @@ void BKE_animdata_merge_copy(ID *dst_id, ID *src_id, eAnimData_MergeCopy_Modes a if (src->nla_tracks.first) { ListBase tracks = {NULL, NULL}; - BKE_nla_tracks_copy(&tracks, &src->nla_tracks); + BKE_nla_tracks_copy(G.main, &tracks, &src->nla_tracks); BLI_movelisttolist(&dst->nla_tracks, &tracks); } |