svn merge -r 17201:17502 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-11-19 19:28:12 +00:00
parent 14a0718a8a f8e56e96bf
commit 28da9ad12e
319 changed files with 57444 additions and 3254 deletions
--- a/source/blender/render/extern/include/RE_shader_ext.h
+++ b/source/blender/render/extern/include/RE_shader_ext.h
@@ -184,6 +184,7 @@ typedef struct ShadeInput
 /* node shaders... */
 struct Tex;
 int	multitex_ext(struct Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, struct TexResult *texres);
+int	multitex_thread(struct Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, struct TexResult *texres, short thread, short which_output);

 /* shaded view and bake */
 struct Render;