[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23748] trunk/blender/source/blender/ render/intern/source/texture.c: Bugfix: texture nodes render without OSA was using uninitialized

[Brecht Van Lommel]

Revision: 23748
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23748
Author:   blendix
Date:     2009-10-09 22:59:44 +0200 (Fri, 09 Oct 2009)

Log Message:
-----------
Bugfix: texture nodes render without OSA was using uninitialized
variables, giving incorrect results.

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

Modified: trunk/blender/source/blender/render/intern/source/texture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/texture.c 2009-10-09 
20:44:50 UTC (rev 23747)
+++ trunk/blender/source/blender/render/intern/source/texture.c 2009-10-09 
20:59:44 UTC (rev 23748)
@@ -1182,7 +1182,8 @@
        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) {


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs