Bugfix: texture nodes render without OSA was using uninitialized
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Fri, 9 Oct 2009 20:59:44 +0000 (20:59 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Fri, 9 Oct 2009 20:59:44 +0000 (20:59 +0000)
variables, giving incorrect results.

source/blender/render/intern/source/texture.c

index aee2d8d186655afc46a1339228c2444199c31e7e..64683e8e7daed637da368a33e7b0c6e5287b9031 100644 (file)
@@ -1182,7 +1182,8 @@ static int multitex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex,
        texres->talpha= 0;      /* is set when image texture returns alpha (considered premul) */
        
        if(tex->use_nodes && tex->nodetree) {
-               retval = evalnodes(tex, texvec, dxt, dyt, texres, thread, which_output);
+               if(osatex) retval = evalnodes(tex, texvec, dxt, dyt, texres, thread, which_output);
+               else retval = evalnodes(tex, texvec, NULL, NULL, texres, thread, which_output);
        }
        else
        switch(tex->type) {