[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27841] branches/render25/source/blender/ blenkernel/intern/anim.c: Render Branch: Fix a problem with particle duplis , due to own bugfix for #20350,

[Brecht Van Lommel]

Revision: 27841
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27841
Author:   blendix
Date:     2010-03-29 20:29:54 +0200 (Mon, 29 Mar 2010)

Log Message:
-----------
Render Branch: Fix a problem with particle duplis, due to own bugfix for #20350,
the problem for that seems to be in dupliverts, not particles.

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

Modified: branches/render25/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/anim.c	2010-03-29 16:13:32 UTC (rev 27840)
+++ branches/render25/source/blender/blenkernel/intern/anim.c	2010-03-29 18:29:54 UTC (rev 27841)
@@ -1073,7 +1073,7 @@
 	ParticleCacheKey *cache;
 	float ctime, pa_time, scale = 1.0f;
 	float tmat[4][4], mat[4][4], pamat[4][4], vec[3], size=0.0;
-	float (*obmat)[4], (*oldobmat)[4], recurs_mat[4][4];
+	float (*obmat)[4], (*oldobmat)[4];
 	int lay, a, b, counter, hair = 0;
 	int totpart, totchild, totgroup=0, pa_num;
 
@@ -1090,10 +1090,6 @@
 	if(!psys_check_enabled(par, psys))
 		return;
 	
-	/* particles are already in world space, don't want the object mat twice */
-	if(par_space_mat)
-		mul_m4_m4m4(recurs_mat, psys->imat, par_space_mat);
-
 	ctime = bsystem_time(scene, par, (float)scene->r.cfra, 0.0);
 
 	totpart = psys->totpart;
@@ -1237,7 +1233,7 @@
 					mul_m4_m4m4(tmat, oblist[b]->obmat, pamat);
 					mul_mat3_m4_fl(tmat, size*scale);
 					if(par_space_mat)
-						mul_m4_m4m4(mat, tmat, recurs_mat);
+						mul_m4_m4m4(mat, tmat, par_space_mat);
 					else
 						copy_m4_m4(mat, tmat);
 
@@ -1263,7 +1259,7 @@
 					VECADD(tmat[3], tmat[3], vec);
 
 				if(par_space_mat)
-					mul_m4_m4m4(mat, tmat, recurs_mat);
+					mul_m4_m4m4(mat, tmat, par_space_mat);
 				else
 					copy_m4_m4(mat, tmat);