[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31829] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: Partial fix for [#23714] Linked instance group with particles doesn't render properly

[Janne Karhu]

Revision: 31829
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31829
Author:   jhk
Date:     2010-09-08 13:08:34 +0200 (Wed, 08 Sep 2010)

Log Message:
-----------
Partial fix for [#23714] Linked instance group with particles doesn't render properly
* Only partial because rendering of dupliobjects / groups with particles isn't yet fully implemented

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

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c	2010-09-08 10:43:36 UTC (rev 31828)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2010-09-08 11:08:34 UTC (rev 31829)
@@ -4077,7 +4077,8 @@
 	psys->cfra = cfra;
 	psys->recalc = 0;
 
-	/* save matrix for duplicators */
-	invert_m4_m4(psys->imat, ob->obmat);
+	/* save matrix for duplicators, at rendertime the actual dupliobject's matrix is used so don't update! */
+	if(psys->renderdata==0)
+		invert_m4_m4(psys->imat, ob->obmat);
 }