diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-07-06 13:58:29 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-07-06 13:58:29 +0400 |
| commit | 5470326c3bc190fd1d2d02c97131818a5438f392 (patch) | |
| tree | 9e19a9aa9fc59968fb29f658eb3f9877ae40ccc5 /source/blender/nodes | |
| parent | febce577ba577f2a3fa888f8f2922ed1898a3ef2 (diff) | |
Fix #27875: different texture nodes result after decompose/compose.
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/intern/TEX_nodes/TEX_texture.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_texture.c b/source/blender/nodes/intern/TEX_nodes/TEX_texture.c index d4d77b5fd5a..51c7c0ed341 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_texture.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_texture.c @@ -51,7 +51,11 @@ static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, shor { static float red[] = {1,0,0,1}; static float white[] = {1,1,1,1}; - float *co = p->co; + float co[3], dxt[3], dyt[3]; + + copy_v3_v3(co, p->co); + copy_v3_v3(dxt, p->dxt); + copy_v3_v3(dyt, p->dyt); Tex *nodetex = (Tex *)node->id; @@ -70,9 +74,9 @@ static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, shor tex_input_rgba(col1, in[0], p, thread); tex_input_rgba(col2, in[1], p, thread); - + texres.nor = nor; - textype = multitex_nodes(nodetex, co, p->dxt, p->dyt, p->osatex, + textype = multitex_nodes(nodetex, co, dxt, dyt, p->osatex, &texres, thread, 0, p->shi, p->mtex); if(textype & TEX_RGB) { |