[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17615] branches/soc-2007-joeedh/source/ blender/render/intern/source/dsm.c: yay duplis work! yaygdb ../socinstall/ blender.exe gdb ../socinstall/blender.exe

[Joseph Eagar]

Revision: 17615
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17615
Author:   joeedh
Date:     2008-11-29 13:12:33 +0100 (Sat, 29 Nov 2008)

Log Message:
-----------
yay duplis work! yaygdb ../socinstall/blender.exe gdb ../socinstall/blender.exe 

Modified Paths:
--------------
    branches/soc-2007-joeedh/source/blender/render/intern/source/dsm.c

Modified: branches/soc-2007-joeedh/source/blender/render/intern/source/dsm.c
===================================================================
--- branches/soc-2007-joeedh/source/blender/render/intern/source/dsm.c	2008-11-29 11:34:51 UTC (rev 17614)
+++ branches/soc-2007-joeedh/source/blender/render/intern/source/dsm.c	2008-11-29 12:12:33 UTC (rev 17615)
@@ -227,44 +227,16 @@
 		if(obi->flag & R_DUPLI_TRANSFORMED) {
 			MTC_Mat4MulMat4(mat4, obi->mat, viewinv);
 			MTC_Mat4MulMat4(obi->mat, mat4, newview);
-
-			MTC_Mat3CpyMat4(mat3, obi->mat);
-			MTC_Mat3Inv(obi->nmat, mat3);
-			Mat3Transp(obi->nmat);
 		} else {
-			if (mode) MTC_Mat4MulMat4(obi->mat, oldview, newview);
+			if (mode) MTC_Mat4MulMat4(obi->mat, viewinv, newview);
 			else MTC_Mat4One(obi->mat);
 		}
-	}
+		MTC_Mat3CpyMat4(mat3, obi->mat);
+		MTC_Mat3Inv(obi->nmat, mat3);
+		Mat3Transp(obi->nmat);
 
-	for(i=0, obr=re->objecttable.first; obr; i++, obr=obr->next) {
-		for (j=0; j<obr->totvert; j++) {
-			vert = RE_findOrAddVert(obr, j);
-			MTC_Mat4MulVecfl(viewinv, vert->co);
-			MTC_Mat4MulVecfl(newview, vert->co);
-
-			MTC_Mat3MulVecfl(imat, vert->n);
-			MTC_Mat3MulVecfl(mat, vert->n);
-		}
-		
-		/*do strands*/
-		for (j=0; j<obr->totstrand; j++) {
-			if((j & 255)==0) strand= obr->strandnodes[j>>8].strand;
-			else strand++;	
-			
-			svert= strand->vert;
-			for (a=0; a < strand->totvert; a++, svert++) {
-				MTC_Mat4MulVecfl(viewinv, svert->co);
-				MTC_Mat4MulVecfl(newview, svert->co);
-			}
-			
-		}
-
-		for (j=0; j<obr->totvlak; j++) {
-			vlak = RE_findOrAddVlak(obr, j);
-			MTC_Mat3MulVecfl(imat, vlak->n);
-			MTC_Mat3MulVecfl(mat, vlak->n);
-		}
+		if (mode) obi->flag |= R_ENV_TRANSFORMED;
+		else obi->flag &= ~R_ENV_TRANSFORMED;
 	}
 }