[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37116] trunk/blender/source/blender/ blenkernel/intern/particle.c: Fix for [#27461] Particle Instance modifier doesn't work correctly with Hair Dynamics.

[Janne Karhu]

Revision: 37116
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37116
Author:   jhk
Date:     2011-06-03 05:51:39 +0000 (Fri, 03 Jun 2011)
Log Message:
-----------
Fix for [#27461] Particle Instance modifier doesn't work correctly with Hair Dynamics.
* Wrong matrix used for dynamic hair.

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	2011-06-03 04:39:18 UTC (rev 37115)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c	2011-06-03 05:51:39 UTC (rev 37116)
@@ -4018,7 +4018,11 @@
 		init_particle_interpolation(sim->ob, psys, pa, &pind);
 		do_particle_interpolation(psys, p, pa, t, &pind, state);
 
-		if(!keyed && !cached) {
+		if(pind.dm) {
+			mul_m4_v3(sim->ob->obmat, state->co);
+			mul_mat3_m4_v3(sim->ob->obmat, state->vel);
+		}
+		else if(!keyed && !cached && !(psys->flag & PSYS_GLOBAL_HAIR)) {
 			if((pa->flag & PARS_REKEY)==0) {
 				psys_mat_hair_to_global(sim->ob, sim->psmd->dm, part->from, pa, hairmat);
 				mul_m4_v3(hairmat, state->co);