From 42c7200248dc0ab2971f8ce408888e28f4b1b182 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 7 Mar 2015 03:05:38 +1100 Subject: CustomData: don't calloc when duplicating layers --- source/blender/blenkernel/intern/customdata.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 483a4b979b9..65ec6be5a60 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -1810,7 +1810,13 @@ static CustomDataLayer *customData_add_layer__internal(CustomData *data, int typ newlayerdata = layerdata; } else if (size > 0) { - newlayerdata = MEM_callocN(size, layerType_getName(type)); + if (alloctype == CD_DUPLICATE && layerdata) { + newlayerdata = MEM_mallocN(size, layerType_getName(type)); + } + else { + newlayerdata = MEM_callocN(size, layerType_getName(type)); + } + if (!newlayerdata) return NULL; } -- cgit v1.2.3