diff options
Diffstat (limited to 'source/blender/nodes/intern/TEX_util.c')
| -rw-r--r-- | source/blender/nodes/intern/TEX_util.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/source/blender/nodes/intern/TEX_util.c b/source/blender/nodes/intern/TEX_util.c index dc31685827f..bb97e2f82fa 100644 --- a/source/blender/nodes/intern/TEX_util.c +++ b/source/blender/nodes/intern/TEX_util.c @@ -1,4 +1,4 @@ -/** +/* * * ***** BEGIN GPL LICENSE BLOCK ***** * @@ -29,11 +29,11 @@ /* HOW TEXTURE NODES WORK - In contrast to Shader nodes, which place a colour into the output + In contrast to Shader nodes, which place a color into the output stack when executed, Texture nodes place a TexDelegate* there. To - obtain a colour value from this, a node further up the chain reads + obtain a color value from this, a node further up the chain reads the TexDelegate* from its input stack, and uses tex_call_delegate to - retrieve the colour from the delegate. + retrieve the color from the delegate. comments: (ton) @@ -57,7 +57,7 @@ void tex_call_delegate(TexDelegate *dg, float *out, TexParams *params, short thr } } -void tex_input(float *out, int sz, bNodeStack *in, TexParams *params, short thread) +static void tex_input(float *out, int sz, bNodeStack *in, TexParams *params, short thread) { TexDelegate *dg = in->data; if(dg) { @@ -173,7 +173,7 @@ int ntreeTexExecTree( float *dxt, float *dyt, int osatex, short thread, - Tex *tex, + Tex *UNUSED(tex), short which_output, int cfra, int preview, @@ -181,6 +181,7 @@ int ntreeTexExecTree( MTex *mtex ){ TexCallData data; + float *nor= texres->nor; int retval = TEX_INT; data.co = co; @@ -199,6 +200,9 @@ int ntreeTexExecTree( if(texres->nor) retval |= TEX_NOR; retval |= TEX_RGB; + /* confusing stuff; the texture output node sets this to NULL to indicate no normal socket was set + however, the texture code checks this for other reasons (namely, a normal is required for material) */ + texres->nor= nor; return retval; } |