[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25894] trunk/blender/source/blender/ blenkernel/intern/modifier.c: Fix #20619: subsurf + explode modifier crash.

[Brecht Van Lommel]

Revision: 25894
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25894
Author:   blendix
Date:     2010-01-11 11:22:24 +0100 (Mon, 11 Jan 2010)

Log Message:
-----------
Fix #20619: subsurf + explode modifier crash.

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

Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c	2010-01-11 06:57:41 UTC (rev 25893)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c	2010-01-11 10:22:24 UTC (rev 25894)
@@ -7869,7 +7869,7 @@
   DerivedMesh *to_explode)
 {
 	DerivedMesh *explode, *dm=to_explode;
-	MFace *mf=0;
+	MFace *mf=0, *mface;
 	ParticleSettings *part=psmd->psys->part;
 	ParticleSimulationData sim = {scene, ob, psmd->psys, psmd};
 	ParticleData *pa=NULL, *pars=psmd->psys->particles;
@@ -7885,6 +7885,7 @@
 
 	totface= dm->getNumFaces(dm);
 	totvert= dm->getNumVerts(dm);
+	mface= dm->getFaceArray(dm);
 	totpart= psmd->psys->totpart;
 
 	timestep= psys_get_timestep(&sim);
@@ -7905,7 +7906,7 @@
 		else 
 			mindex = totvert+facepa[i];
 
-		mf=CDDM_get_face(dm,i);
+		mf= &mface[i];
 
 		/* set face vertices to exist in particle group */
 		BLI_edgehash_insert(vertpahash, mf->v1, mindex, NULL);
@@ -8013,8 +8014,6 @@
 		test_index_face(mf, &explode->faceData, i, (orig_v4 ? 4 : 3));
 	}
 
-	MEM_printmemlist_stats();
-
 	/* cleanup */
 	BLI_edgehash_free(vertpahash, NULL);