[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14940] trunk/blender/source/blender/ render/intern/source/envmap.c:

[Brecht Van Lommel]

Revision: 14940
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14940
Author:   blendix
Date:     2008-05-23 12:06:06 +0200 (Fri, 23 May 2008)

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

Fix for bug #12526: object instancing didn't restore matrices
correct for envmap, could give objects rendering in the wrong
position.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/envmap.c

Modified: trunk/blender/source/blender/render/intern/source/envmap.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/envmap.c	2008-05-23 09:58:33 UTC (rev 14939)
+++ trunk/blender/source/blender/render/intern/source/envmap.c	2008-05-23 10:06:06 UTC (rev 14940)
@@ -225,7 +225,7 @@
 	ObjectInstanceRen *obi;
 	LampRen *lar = NULL;
 	HaloRen *har = NULL;
-	float imat[3][3], pmat[4][4], smat[4][4], tmat[4][4], cmat[3][3];
+	float imat[3][3], pmat[4][4], smat[4][4], tmat[4][4], cmat[3][3], tmpmat[4][4];
 	int a;
 	
 	if(mode==0) {
@@ -239,8 +239,10 @@
 
 	for(obi=re->instancetable.first; obi; obi=obi->next) {
 		/* append or set matrix depending on dupli */
-		if(obi->flag & R_DUPLI_TRANSFORMED)
-			Mat4MulMat4(obi->mat, tmat, obi->mat);
+		if(obi->flag & R_DUPLI_TRANSFORMED) {
+			Mat4CpyMat4(tmpmat, obi->mat);
+			Mat4MulMat4(obi->mat, tmat, tmpmat);
+		}
 		else if(mode==1)
 			Mat4CpyMat4(obi->mat, tmat);
 		else