[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40146] branches/bmesh/blender/source/ blender: fix memory leak in array modifier not freeing editmesh, also use better names for allocs.

[Campbell Barton]

Revision: 40146
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40146
Author:   campbellbarton
Date:     2011-09-12 02:44:17 +0000 (Mon, 12 Sep 2011)
Log Message:
-----------
fix memory leak in array modifier not freeing editmesh, also use better names for allocs.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_array.c

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c	2011-09-12 02:36:14 UTC (rev 40145)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c	2011-09-12 02:44:17 UTC (rev 40146)
@@ -94,7 +94,7 @@
 
 BMEditMesh *BMEdit_Create(BMesh *bm)
 {
-	BMEditMesh *tm = MEM_callocN(sizeof(BMEditMesh), "tm");
+	BMEditMesh *tm = MEM_callocN(sizeof(BMEditMesh), __func__);
 	
 	tm->bm = bm;
 
@@ -105,7 +105,7 @@
 
 BMEditMesh *BMEdit_Copy(BMEditMesh *tm)
 {
-	BMEditMesh *tm2 = MEM_callocN(sizeof(BMEditMesh), "tm2");
+	BMEditMesh *tm2 = MEM_callocN(sizeof(BMEditMesh), __func__);
 	*tm2 = *tm;
 	
 	tm2->derivedCage = tm2->derivedFinal = NULL;
@@ -1532,7 +1532,7 @@
 DerivedMesh *getEditDerivedBMesh(BMEditMesh *em, Object *UNUSED(ob),
                                            float (*vertexCos)[3])
 {
-	EditDerivedBMesh *bmdm = MEM_callocN(sizeof(*bmdm), "bmdm");
+	EditDerivedBMesh *bmdm = MEM_callocN(sizeof(*bmdm), __func__);
 	BMesh *bm = em->bm;
 	
 	bmdm->tc = em;

Modified: branches/bmesh/blender/source/blender/modifiers/intern/MOD_array.c
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/intern/MOD_array.c	2011-09-12 02:36:14 UTC (rev 40145)
+++ branches/bmesh/blender/source/blender/modifiers/intern/MOD_array.c	2011-09-12 02:44:17 UTC (rev 40146)
@@ -480,6 +480,7 @@
 	cddm = CDDM_from_BMEditMesh(em, NULL, 0);
 
 	BMEdit_Free(em);
+	MEM_freeN(em);
 	MEM_freeN(indexMap);
 
 	return cddm;