Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2009-10-10 00:59:44 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2009-10-10 00:59:44 +0400
commita5b30906ad7ae583631fb0f20ca5cf1cbebebd2f (patch)
tree20f5989585cd52037c18817c1b194dd21a890973 /source/blender/render
parent7d07342c09f82cea15ad4767eed407483c5661a9 (diff)
Bugfix: texture nodes render without OSA was using uninitialized
variables, giving incorrect results.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/texture.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index aee2d8d1866..64683e8e7da 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -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) {