[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39515] trunk/blender/source/blender/ blenkernel/intern/anim.c: Fix for [#28216] particles objects rotation still wrong with r39287

[Janne Karhu]

Revision: 39515
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39515
Author:   jhk
Date:     2011-08-18 02:12:23 +0000 (Thu, 18 Aug 2011)
Log Message:
-----------
Fix for [#28216] particles objects rotation still wrong with r39287
* The emitter object's inverse matrix wasn't in global coordinates during rendering, so the surface normals of the hair emission locations were transformed with the wrong matrix.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39287

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

Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c	2011-08-17 23:04:06 UTC (rev 39514)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c	2011-08-18 02:12:23 UTC (rev 39515)
@@ -1245,6 +1245,8 @@
 		sim.ob= par;
 		sim.psys= psys;
 		sim.psmd= psys_get_modifier(par, psys);
+		/* make sure emitter imat is in global coordinates instead of render view coordinates */
+		invert_m4_m4(par->imat, par->obmat);
 
 		/* first check for loops (particle system object used as dupli object) */
 		if(part->ren_as == PART_DRAW_OB) {