[Bf-blender-cvs] [5af3b02] master: Fix T38578: blender internal texture nodes + volume render error.
Brecht Van Lommel
noreply at git.blender.org
Tue Feb 11 16:10:54 CET 2014
Commit: 5af3b02f72e74c0ed05851d7c38775c042b45b1a
Author: Brecht Van Lommel
Date: Tue Feb 11 16:09:53 2014 +0100
https://developer.blender.org/rB5af3b02f72e74c0ed05851d7c38775c042b45b1a
Fix T38578: blender internal texture nodes + volume render error.
===================================================================
M source/blender/render/intern/source/render_texture.c
===================================================================
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c
index 78b2225..0d9f466 100644
--- a/source/blender/render/intern/source/render_texture.c
+++ b/source/blender/render/intern/source/render_texture.c
@@ -2756,7 +2756,7 @@ void do_volume_tex(ShadeInput *shi, const float *xyz, int mapto_flag, float col_
else texvec[2]= mtex->size[2]*(mtex->ofs[2]);
}
- rgbnor = multitex(tex, texvec, NULL, NULL, 0, &texres, 0, mtex->which_output, re->pool); /* NULL = dxt/dyt, 0 = shi->osatex - not supported */
+ rgbnor = multitex(tex, texvec, NULL, NULL, 0, &texres, shi->thread, mtex->which_output, re->pool); /* NULL = dxt/dyt, 0 = shi->osatex - not supported */
/* texture output */
More information about the Bf-blender-cvs
mailing list