[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25930] trunk/blender/source/blender/ blenkernel/intern/particle.c: bugfix for particle editmode operators from ( Janne Karhu)

[Campbell Barton]

Revision: 25930
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25930
Author:   campbellbarton
Date:     2010-01-12 17:29:05 +0100 (Tue, 12 Jan 2010)

Log Message:
-----------
bugfix for particle editmode operators from (Janne Karhu)
psys_get_particle_on_path was taking dynamics into account, making subdivide add points in odd places.

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

Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c	2010-01-12 14:52:09 UTC (rev 25929)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c	2010-01-12 16:29:05 UTC (rev 25930)
@@ -3856,7 +3856,9 @@
 		pind.cache = cached ? psys->pointcache : NULL;
 		pind.epoint = NULL;
 		pind.bspline = (psys->part->flag & PART_HAIR_BSPLINE);
-		pind.dm = psys->hair_out_dm;
+		/* pind.dm disabled in editmode means we dont get effectors taken into
+		 * account when subdividing for instance */
+		pind.dm = psys_in_edit_mode(sim->scene, psys) ? NULL : psys->hair_out_dm;
 		init_particle_interpolation(sim->ob, psys, pa, &pind);
 		do_particle_interpolation(psys, p, pa, t, frs_sec, &pind, state);