Undo revision 23130 which was a merge with 2.5, a messy one because I did something...
[blender.git] / source / blender / render / intern / source / shadbuf.c
index 48305d3..33085b9 100644 (file)
@@ -26,7 +26,7 @@
 #include <math.h>
 #include <string.h>
 
-
+#include "MTC_matrixops.h"
 #include "MEM_guardedalloc.h"
 
 #include "DNA_group_types.h"
@@ -403,7 +403,7 @@ void makeshadowbuf(Render *re, LampRen *lar)
        wsize= shb->pixsize*(shb->size/2.0);
        
        i_window(-wsize, wsize, -wsize, wsize, shb->d, shb->clipend, shb->winmat);
-       Mat4MulMat4(shb->persmat, shb->viewmat, shb->winmat);
+       MTC_Mat4MulMat4(shb->persmat, shb->viewmat, shb->winmat);
 
        if(ELEM(lar->buftype, LA_SHADBUF_REGULAR, LA_SHADBUF_HALFWAY)) {
                /* jitter, weights - not threadsafe! */
@@ -673,7 +673,7 @@ float testshadowbuf(Render *re, ShadBuf *shb, float *rco, float *dxco, float *dy
        VECCOPY(co, rco);
        co[3]= 1.0f;
 
-       Mat4MulVec4fl(shb->persmat, co);        /* rational hom co */
+       MTC_Mat4MulVec4fl(shb->persmat, co);    /* rational hom co */
 
        xs1= siz*(1.0f+co[0]/co[3]);
        ys1= siz*(1.0f+co[1]/co[3]);
@@ -714,7 +714,7 @@ float testshadowbuf(Render *re, ShadBuf *shb, float *rco, float *dxco, float *dy
        co[1]= rco[1]+dxco[1];
        co[2]= rco[2]+dxco[2];
        co[3]= 1.0;
-       Mat4MulVec4fl(shb->persmat,co);     /* rational hom co */
+       MTC_Mat4MulVec4fl(shb->persmat,co);     /* rational hom co */
        dx[0]= xs1- siz*(1.0+co[0]/co[3]);
        dx[1]= ys1- siz*(1.0+co[1]/co[3]);
        
@@ -722,7 +722,7 @@ float testshadowbuf(Render *re, ShadBuf *shb, float *rco, float *dxco, float *dy
        co[1]= rco[1]+dyco[1];
        co[2]= rco[2]+dyco[2];
        co[3]= 1.0;
-       Mat4MulVec4fl(shb->persmat,co);     /* rational hom co */
+       MTC_Mat4MulVec4fl(shb->persmat,co);     /* rational hom co */
        dy[0]= xs1- siz*(1.0+co[0]/co[3]);
        dy[1]= ys1- siz*(1.0+co[1]/co[3]);
        
@@ -858,7 +858,7 @@ float shadow_halo(LampRen *lar, float *p1, float *p2)
        co[1]= p1[1];
        co[2]= p1[2]/lar->sh_zfac;
        co[3]= 1.0;
-       Mat4MulVec4fl(shb->winmat, co); /* rational hom co */
+       MTC_Mat4MulVec4fl(shb->winmat, co);     /* rational hom co */
        xf1= siz*(1.0+co[0]/co[3]);
        yf1= siz*(1.0+co[1]/co[3]);
        zf1= (co[2]/co[3]);
@@ -868,7 +868,7 @@ float shadow_halo(LampRen *lar, float *p1, float *p2)
        co[1]= p2[1];
        co[2]= p2[2]/lar->sh_zfac;
        co[3]= 1.0;
-       Mat4MulVec4fl(shb->winmat, co); /* rational hom co */
+       MTC_Mat4MulVec4fl(shb->winmat, co);     /* rational hom co */
        xf2= siz*(1.0+co[0]/co[3]);
        yf2= siz*(1.0+co[1]/co[3]);
        zf2= (co[2]/co[3]);
@@ -1659,7 +1659,7 @@ static int viewpixel_to_lampbuf(ShadBuf *shb, ObjectInstanceRen *obi, VlakRen *v
        }
        
        /* move 3d vector to lampbuf */
-       Mat4MulVec4fl(shb->persmat, hoco);      /* rational hom co */
+       MTC_Mat4MulVec4fl(shb->persmat, hoco);  /* rational hom co */
        
        /* clip We can test for -1.0/1.0 because of the properties of the
         * coordinate transformations. */