[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42244] trunk/blender/source/blender/ blenkernel/intern/anim.c: avoid allocating verts & faces for dupliface + editmode.

Campbell Barton ideasman42 at gmail.com
Tue Nov 29 07:34:20 CET 2011


Revision: 42244
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42244
Author:   campbellbarton
Date:     2011-11-29 06:34:11 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
avoid allocating verts & faces for dupliface + editmode.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/anim.c

Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c	2011-11-29 06:19:40 UTC (rev 42243)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c	2011-11-29 06:34:11 UTC (rev 42244)
@@ -1030,27 +1030,17 @@
 	
 	em = BKE_mesh_get_editmesh(me);
 	if(em) {
-		int totvert;
-		
 		dm= editmesh_get_derived_cage(scene, par, em, CD_MASK_BAREMESH);
-		
-		totface= dm->getNumFaces(dm);
-		mface= MEM_mallocN(sizeof(MFace)*totface, "mface temp");
-		dm->copyFaceArray(dm, mface);
-		totvert= dm->getNumVerts(dm);
-		mvert= MEM_mallocN(sizeof(MVert)*totvert, "mvert temp");
-		dm->copyVertArray(dm, mvert);
-
 		BKE_mesh_end_editmesh(me, em);
 	}
 	else {
 		dm = mesh_get_derived_deform(scene, par, CD_MASK_BAREMESH);
-		
-		totface= dm->getNumFaces(dm);
-		mface= dm->getFaceArray(dm);
-		mvert= dm->getVertArray(dm);
 	}
 
+	totface= dm->getNumFaces(dm);
+	mface= dm->getFaceArray(dm);
+	mvert= dm->getVertArray(dm);
+
 	if(G.rendering) {
 
 		orco= (float(*)[3])get_mesh_orco_verts(par);
@@ -1189,11 +1179,6 @@
 		if (sce)	base= base->next;	/* scene loop */
 		else		go= go->next;		/* group loop */
 	}
-	
-	if(em) {
-		MEM_freeN(mface);
-		MEM_freeN(mvert);
-	}
 
 	if(orco)
 		MEM_freeN(orco);




More information about the Bf-blender-cvs mailing list