diff options
author | Ton Roosendaal <ton@blender.org> | 2011-07-06 15:44:27 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2011-07-06 15:44:27 +0400 |
commit | 9f25b85168ca98c916276ef77644599138633c79 (patch) | |
tree | 71f48e0c4ddbf7232e974b207a613c4645003cf2 /source/blender/nodes | |
parent | ed897750cae4d03a3069fde0b94caffa46119066 (diff) |
Making Blender compile for C90 standard, var declared after code :)
Also cleaned a line of code that was horribly spread over 4 lines.
Diffstat (limited to 'source/blender/nodes')
-rw-r--r-- | source/blender/nodes/intern/TEX_nodes/TEX_texture.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_texture.c b/source/blender/nodes/intern/TEX_nodes/TEX_texture.c index 51c7c0ed341..f0bc2bd4a7c 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_texture.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_texture.c @@ -49,6 +49,7 @@ static bNodeSocketType outputs[]= { static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, short thread) { + Tex *nodetex = (Tex *)node->id; static float red[] = {1,0,0,1}; static float white[] = {1,1,1,1}; float co[3], dxt[3], dyt[3]; @@ -57,14 +58,9 @@ static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, shor copy_v3_v3(dxt, p->dxt); copy_v3_v3(dyt, p->dyt); - Tex *nodetex = (Tex *)node->id; - if(node->custom2 || node->need_exec==0) { /* this node refers to its own texture tree! */ - QUATCOPY( - out, - (fabs(co[0] - co[1]) < .01) ? white : red - ); + QUATCOPY(out, (fabs(co[0] - co[1]) < .01) ? white : red ; } else if(nodetex) { TexResult texres; |