diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-11-19 22:28:12 +0300 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-11-19 22:28:12 +0300 |
| commit | 28da9ad12ee9ab22432401a5c9cd485df971323a (patch) | |
| tree | ae0a5773a38df61531beac365530acb037fa6a9f /source/blender/render/extern/include/RE_shader_ext.h | |
| parent | 14a0718a8a4ed3ee95f6374e20dbe9e74cf3b5c6 (diff) | |
| parent | f8e56e96bf2be4580dd34c33c6379339642638f0 (diff) | |
svn merge -r 17201:17502 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/render/extern/include/RE_shader_ext.h')
| -rw-r--r-- | source/blender/render/extern/include/RE_shader_ext.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h index 112a1e9929d..a37862aa0ae 100644 --- 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; |