[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58393] trunk/blender/source/blender/ blenkernel/intern: code cleanup: use MEM_mallocN rather then MEM_callocN when the array is

[Campbell Barton]

Revision: 58393
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58393
Author:   campbellbarton
Date:     2013-07-19 10:41:16 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
code cleanup: use MEM_mallocN rather then MEM_callocN when the array is
overwritten immediately after.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/customdata.c
    trunk/blender/source/blender/blenkernel/intern/deform.c
    trunk/blender/source/blender/blenkernel/intern/mesh.c

Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c	2013-07-19 10:41:09 UTC (rev 58392)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c	2013-07-19 10:41:16 UTC (rev 58393)
@@ -158,7 +158,7 @@
 		MDeformVert *dvert = (MDeformVert *)((char *)dest + i * size);
 
 		if (dvert->totweight) {
-			MDeformWeight *dw = MEM_callocN(dvert->totweight * sizeof(*dw),
+			MDeformWeight *dw = MEM_mallocN(dvert->totweight * sizeof(*dw),
 			                                "layerCopy_mdeformvert dw");
 
 			memcpy(dw, dvert->dw, dvert->totweight * sizeof(*dw));
@@ -265,7 +265,7 @@
 	if (dvert->dw) MEM_freeN(dvert->dw);
 
 	if (totweight) {
-		dvert->dw = MEM_callocN(sizeof(*dvert->dw) * totweight,
+		dvert->dw = MEM_mallocN(sizeof(*dvert->dw) * totweight,
 		                        "layerInterp_mdeformvert dvert->dw");
 		dvert->totweight = totweight;
 

Modified: trunk/blender/source/blender/blenkernel/intern/deform.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/deform.c	2013-07-19 10:41:09 UTC (rev 58392)
+++ trunk/blender/source/blender/blenkernel/intern/deform.c	2013-07-19 10:41:16 UTC (rev 58393)
@@ -735,7 +735,7 @@
 	if (dw_new)
 		return dw_new;
 
-	dw_new = MEM_callocN(sizeof(MDeformWeight) * (dvert->totweight + 1), "deformWeight");
+	dw_new = MEM_mallocN(sizeof(MDeformWeight) * (dvert->totweight + 1), "deformWeight");
 	if (dvert->dw) {
 		memcpy(dw_new, dvert->dw, sizeof(MDeformWeight) * dvert->totweight);
 		MEM_freeN(dvert->dw);

Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c	2013-07-19 10:41:09 UTC (rev 58392)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c	2013-07-19 10:41:16 UTC (rev 58393)
@@ -2189,10 +2189,13 @@
 				if (ld->disps)
 					MEM_freeN(ld->disps);
 
-				ld->disps = MEM_callocN(sizeof(float) * 3 * side * side, "converted loop mdisps");
+				ld->disps = MEM_mallocN(sizeof(float) * 3 * side * side, "converted loop mdisps");
 				if (fd->disps) {
 					memcpy(ld->disps, disps, sizeof(float) * 3 * side * side);
 				}
+				else {
+					memset(ld->disps, 0, sizeof(float) * 3 * side * side);
+				}
 			}
 		}
 	}