[Bf-blender-cvs] [08a2bde6858] greasepencil-object: Modify copy function after merge

[Antonio Vazquez]

Commit: 08a2bde6858d6192bf4fba1517a034da118556bb
Author: Antonio Vazquez
Date:   Sat Jun 16 10:17:02 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB08a2bde6858d6192bf4fba1517a034da118556bb

Modify copy function after merge

===================================================================

M	source/blender/blenkernel/intern/gpencil.c

===================================================================

diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 87e891ff173..27b1f181811 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -710,10 +710,8 @@ bGPdata *BKE_gpencil_data_duplicate(Main *bmain, const bGPdata *gpd_src, bool in
 	}
 	else {
 		BLI_assert(bmain != NULL);
-		bGPdata *gpd_copy;
-		BKE_id_copy_ex(bmain, &gpd_src->id, (ID **)&gpd_copy, 0, false);
-		gpd_copy->runtime.batch_cache_data = NULL;
-		return gpd_copy;
+		BKE_id_copy_ex(bmain, &gpd_src->id, (ID **)&gpd_dst, 0, false);
+		gpd_dst->runtime.batch_cache_data = NULL;
 	}
 	
 	/* Copy internal data (layers, etc.) */