Cycles: svn merge -r39457:39669 https://svn.blender.org/svnroot/bf-blender/trunk...
[blender-staging.git] / source / blender / render / intern / source / render_texture.c
index a4c1778c62417b220e2b3e3b56ebe49d26e19ce1..2221d234c37ac309b4871f899d0b245462962c75 100644 (file)
@@ -1362,9 +1362,9 @@ int multitex_ext_safe(Tex *tex, float *texvec, TexResult *texres)
 {
        int use_nodes= tex->use_nodes, retval;
        
-       tex->use_nodes= 0;
+       // XXX tex->use_nodes= 0;
        retval= multitex_nodes(tex, texvec, NULL, NULL, 0, texres, 0, 0, NULL, NULL);
-       tex->use_nodes= use_nodes;
+       // XXX tex->use_nodes= use_nodes;
        
        return retval;
 }