From 7c9131d11eb01a70db440fac7bb3f4b3833d544a Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 7 Oct 2020 14:27:33 +0200 Subject: 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. --- source/blender/blenkernel/intern/particle_system.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source/blender/blenkernel/intern/particle_system.c') diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index a7e768a79c7..862ebf43913 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -4744,9 +4744,8 @@ static int hair_needs_recalc(ParticleSystem *psys) static ParticleSettings *particle_settings_localize(ParticleSettings *particle_settings) { - ParticleSettings *particle_settings_local; - BKE_id_copy_ex( - NULL, (ID *)&particle_settings->id, (ID **)&particle_settings_local, LIB_ID_COPY_LOCALIZE); + ParticleSettings *particle_settings_local = (ParticleSettings *)BKE_id_copy_ex( + NULL, (ID *)&particle_settings->id, NULL, LIB_ID_COPY_LOCALIZE); return particle_settings_local; } -- cgit v1.2.3