From 03ef0cfe3c3327647be5289d8ecddea820401221 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 7 Oct 2020 16:13:01 +0200 Subject: Refactor `BKE_id_copy` to return the new ID pointer. No reasons to keep the new ID pointer as parameter here. Part of T71219. --- source/blender/makesrna/intern/rna_ID.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'source/blender/makesrna/intern/rna_ID.c') diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index f1c125fcbb9..320476c22b1 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -523,16 +523,12 @@ static ID *rna_ID_evaluated_get(ID *id, struct Depsgraph *depsgraph) static ID *rna_ID_copy(ID *id, Main *bmain) { - ID *newid; + ID *newid = BKE_id_copy(bmain, id); - if (BKE_id_copy(bmain, id, &newid)) { - if (newid != NULL) { - id_us_min(newid); - } - return newid; + if (newid != NULL) { + id_us_min(newid); } - - return NULL; + return newid; } static ID *rna_ID_override_create(ID *id, Main *bmain, bool remap_local_usages) -- cgit v1.2.3