[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14926] trunk/blender/source/blender/ blenkernel/intern/anim.c:

[Brecht Van Lommel]

Revision: 14926
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14926
Author:   blendix
Date:     2008-05-22 16:08:13 +0200 (Thu, 22 May 2008)

Log Message:
-----------

Fix for bug #11743: incorrect transformation for particle group
visualization DupliGroup option.

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	2008-05-22 13:58:16 UTC (rev 14925)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c	2008-05-22 14:08:13 UTC (rev 14926)
@@ -881,8 +881,7 @@
 
 				if(part->draw_as==PART_DRAW_GR && psys->part->draw & PART_DRAW_WHOLE_GR) {
 					for(go= part->dup_group->gobject.first, b=0; go; go= go->next, b++) {
-
-						Mat4MulMat4(tmat, obmat, pamat);
+						Mat4MulMat4(tmat, oblist[b]->obmat, pamat);
 						Mat4MulFloat3((float *)tmat, size*scale);
 						if(par_space_mat)
 							Mat4MulMat4(mat, tmat, par_space_mat);
@@ -890,7 +889,7 @@
 							Mat4CpyMat4(mat, tmat);
 
 						dob= new_dupli_object(lb, go->ob, mat, par->lay, counter, OB_DUPLIPARTS, animated);
-						Mat4CpyMat4(dob->omat, oldobmat);
+						Mat4CpyMat4(dob->omat, obcopylist[b].obmat);
 						if(G.rendering)
 							psys_get_dupli_texture(par, part, psmd, pa, cpa, dob->uv, dob->orco);
 					}