[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19572] trunk/blender/source/blender/ blenkernel/intern/modifier.c: Fix for: [#18027] Strange behaviour of Explode modifier in combination with SubSurf

[Janne Karhu]

Revision: 19572
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19572
Author:   jhk
Date:     2009-04-07 05:00:32 +0200 (Tue, 07 Apr 2009)

Log Message:
-----------
Fix for: [#18027] Strange behaviour of Explode modifier in combination with SubSurf
- Explode didn't use the dmcache index for getting the particles emitter position.
- One "tri or quad"-comparison tested the wrong index. Leading to one quad converting into a tri.

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	2009-04-07 00:49:39 UTC (rev 19571)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c	2009-04-07 03:00:32 UTC (rev 19572)
@@ -7193,7 +7193,7 @@
 			pa= pars+i;
 
 			/* get particle state */
-			psys_particle_on_emitter(psmd,part->from,pa->num,-1,pa->fuv,pa->foffset,loc0,nor,0,0,0,0);
+			psys_particle_on_emitter(psmd,part->from,pa->num,pa->num_dmcache,pa->fuv,pa->foffset,loc0,nor,0,0,0,0);
 			Mat4MulVecfl(ob->obmat,loc0);
 
 			state.time=cfra;
@@ -7249,7 +7249,7 @@
 
 		*mf = source;
 
-		test_index_face(mf, &explode->faceData, i, (mf->v4 ? 4 : 3));
+		test_index_face(mf, &explode->faceData, i, (orig_v4 ? 4 : 3));
 	}
 
 	MEM_printmemlist_stats();