[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36085] trunk/blender/source/blender: [ #26848] Keyed Particles seems to be broken

[Janne Karhu]

Revision: 36085
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36085
Author:   jhk
Date:     2011-04-10 11:24:29 +0000 (Sun, 10 Apr 2011)
Log Message:
-----------
[#26848] Keyed Particles seems to be broken
* Explode modifier wasn't updated properly when keyed particles were used.
* Explode modifier didn't get correct locations for grid distributed particles.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/particle_system.c
    trunk/blender/source/blender/modifiers/intern/MOD_explode.c

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c	2011-04-10 10:45:56 UTC (rev 36084)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2011-04-10 11:24:29 UTC (rev 36085)
@@ -4311,6 +4311,9 @@
 						free_keyed_keys(psys);
 						distribute_particles(&sim, part->from);
 						initialize_all_particles(&sim);
+
+						/* flag for possible explode modifiers after this system */
+						sim.psmd->flag |= eParticleSystemFlag_Pars;
 					}
 
 					LOOP_EXISTING_PARTICLES {

Modified: trunk/blender/source/blender/modifiers/intern/MOD_explode.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_explode.c	2011-04-10 10:45:56 UTC (rev 36084)
+++ trunk/blender/source/blender/modifiers/intern/MOD_explode.c	2011-04-10 11:24:29 UTC (rev 36085)
@@ -148,7 +148,7 @@
 	/* make tree of emitter locations */
 	tree=BLI_kdtree_new(totpart);
 	for(p=0,pa=psys->particles; p<totpart; p++,pa++){
-		psys_particle_on_dm(psmd->dm,psys->part->from,pa->num,pa->num_dmcache,pa->fuv,pa->foffset,co,NULL,NULL,NULL,NULL,NULL);
+		psys_particle_on_emitter(psmd,psys->part->from,pa->num,pa->num_dmcache,pa->fuv,pa->foffset,co,NULL,NULL,NULL,NULL,NULL);
 		BLI_kdtree_insert(tree, p, co, NULL);
 	}
 	BLI_kdtree_balance(tree);