diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-10-07 15:27:33 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-10-07 19:05:06 +0300 |
| commit | 7c9131d11eb01a70db440fac7bb3f4b3833d544a (patch) | |
| tree | c7c495566a3f111c8c495f1daa207292bab9c43a /source/blender/blenkernel/intern/anim_data.c | |
| parent | 1f50beb9f28edd2fe54d97647222ad6ee5808c1c (diff) | |
Refactor `BKE_id_copy_ex` to return the new ID pointer.
Note that possibility to pass the new ID pointer as parameter was kept,
as this is needed for some rather specific cases (like in depsgraph/COW,
when copying into already allocated memory).
Part of T71219.
Diffstat (limited to 'source/blender/blenkernel/intern/anim_data.c')
| -rw-r--r-- | source/blender/blenkernel/intern/anim_data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/anim_data.c b/source/blender/blenkernel/intern/anim_data.c index 7e00b1a6407..c677d976783 100644 --- a/source/blender/blenkernel/intern/anim_data.c +++ b/source/blender/blenkernel/intern/anim_data.c @@ -342,8 +342,8 @@ AnimData *BKE_animdata_copy(Main *bmain, AnimData *adt, const int flag) flag; BLI_assert(bmain != NULL); BLI_assert(dadt->action == NULL || dadt->action != dadt->tmpact); - BKE_id_copy_ex(bmain, (ID *)dadt->action, (ID **)&dadt->action, id_copy_flag); - BKE_id_copy_ex(bmain, (ID *)dadt->tmpact, (ID **)&dadt->tmpact, id_copy_flag); + dadt->action = (bAction *)BKE_id_copy_ex(bmain, (ID *)dadt->action, NULL, id_copy_flag); + dadt->tmpact = (bAction *)BKE_id_copy_ex(bmain, (ID *)dadt->tmpact, NULL, id_copy_flag); } else if (do_id_user) { id_us_plus((ID *)dadt->action); |