[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28300] branches/render25/source/blender/ blenkernel/intern/particle.c: Render Branch: Fix particle objects instanced from hair having wrong

[Brecht Van Lommel]

Revision: 28300
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28300
Author:   blendix
Date:     2010-04-20 12:28:54 +0200 (Tue, 20 Apr 2010)

Log Message:
-----------
Render Branch: Fix particle objects instanced from hair having wrong
transform when rendering.

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

Modified: branches/render25/source/blender/blenkernel/intern/particle.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/particle.c	2010-04-20 09:49:00 UTC (rev 28299)
+++ branches/render25/source/blender/blenkernel/intern/particle.c	2010-04-20 10:28:54 UTC (rev 28300)
@@ -4239,7 +4239,7 @@
 				(psys->part->childtype == PART_CHILD_FACES)? PART_FROM_FACE: PART_FROM_PARTICLE,
 				cpa->num,DMCACHE_ISCHILD,cpa->fuv,cpa->foffset,loc,nor,0,0,0,0);
 		
-		copy_m3_m4(nmat, ob->imat);
+		copy_m3_m4(nmat, psys->imat);
 		transpose_m3(nmat);
 		mul_m3_v3(nmat, nor);