Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2020-10-07 17:13:01 +0300
committerBastien Montagne <bastien@blender.org>2020-10-07 19:05:06 +0300
commit03ef0cfe3c3327647be5289d8ecddea820401221 (patch)
treea761b84e34ca5e11a133fa393261f151249cf517 /source/blender/blenkernel/intern/gpencil.c
parent7c9131d11eb01a70db440fac7bb3f4b3833d544a (diff)
Refactor `BKE_id_copy` to return the new ID pointer.
No reasons to keep the new ID pointer as parameter here. Part of T71219.
Diffstat (limited to 'source/blender/blenkernel/intern/gpencil.c')
-rw-r--r--source/blender/blenkernel/intern/gpencil.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 980d608df77..f40cfba5077 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -980,9 +980,7 @@ bGPDlayer *BKE_gpencil_layer_duplicate(const bGPDlayer *gpl_src)
*/
bGPdata *BKE_gpencil_copy(Main *bmain, const bGPdata *gpd)
{
- bGPdata *gpd_copy;
- BKE_id_copy(bmain, &gpd->id, (ID **)&gpd_copy);
- return gpd_copy;
+ return (bGPdata *)BKE_id_copy(bmain, &gpd->id);
}
/**
@@ -1009,7 +1007,7 @@ bGPdata *BKE_gpencil_data_duplicate(Main *bmain, const bGPdata *gpd_src, bool in
}
else {
BLI_assert(bmain != NULL);
- BKE_id_copy(bmain, &gpd_src->id, (ID **)&gpd_dst);
+ gpd_dst = (bGPdata *)BKE_id_copy(bmain, &gpd_src->id);
}
/* Copy internal data (layers, etc.) */