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/gpencil_modifier.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source/blender/blenkernel/intern/gpencil_modifier.c') diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c index 2eccdb872dd..d12e445fe99 100644 --- a/source/blender/blenkernel/intern/gpencil_modifier.c +++ b/source/blender/blenkernel/intern/gpencil_modifier.c @@ -660,10 +660,9 @@ static void gpencil_copy_activeframe_to_eval( static bGPdata *gpencil_copy_for_eval(bGPdata *gpd) { - int flags = LIB_ID_COPY_LOCALIZE; + const int flags = LIB_ID_COPY_LOCALIZE; - bGPdata *result; - BKE_id_copy_ex(NULL, &gpd->id, (ID **)&result, flags); + bGPdata *result = (bGPdata *)BKE_id_copy_ex(NULL, &gpd->id, NULL, flags); return result; } -- cgit v1.2.3