Commit: 42c7200248dc0ab2971f8ce408888e28f4b1b182
Author: Campbell Barton
Date: Sat Mar 7 03:05:38 2015 +1100
Branches: master
https://developer.blender.org/rB42c7200248dc0ab2971f8ce408888e28f4b1b182
CustomData: don't calloc when duplicating layers
===================================================================
M source/blender/blenkernel/intern/customdata.c
===================================================================
diff --git a/source/blender/blenkernel/intern/customdata.c
b/source/blender/blenkernel/intern/customdata.c
index 483a4b9..65ec6be 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;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
