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/hair.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/hair.c')
| -rw-r--r-- | source/blender/blenkernel/intern/hair.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/hair.c b/source/blender/blenkernel/intern/hair.c index b9b88dd062b..edbc13d8773 100644 --- a/source/blender/blenkernel/intern/hair.c +++ b/source/blender/blenkernel/intern/hair.c @@ -330,8 +330,7 @@ Hair *BKE_hair_copy_for_eval(Hair *hair_src, bool reference) flags |= LIB_ID_COPY_CD_REFERENCE; } - Hair *result; - BKE_id_copy_ex(NULL, &hair_src->id, (ID **)&result, flags); + Hair *result = (Hair *)BKE_id_copy_ex(NULL, &hair_src->id, NULL, flags); return result; } |