diff options
Diffstat (limited to 'source/blender/nodes/texture/nodes/node_texture_proc.c')
| -rw-r--r-- | source/blender/nodes/texture/nodes/node_texture_proc.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/nodes/texture/nodes/node_texture_proc.c b/source/blender/nodes/texture/nodes/node_texture_proc.c index 8024ccdc631..b0b646dfd16 100644 --- a/source/blender/nodes/texture/nodes/node_texture_proc.c +++ b/source/blender/nodes/texture/nodes/node_texture_proc.c @@ -44,7 +44,8 @@ static bNodeSocketTemplate outputs_color_only[] = {{SOCK_RGBA, 0, N_("Color")}, SOCK_RGBA, 1, "Color 2", 1.0f, 1.0f, 1.0f, 1.0f \ } -/* Calls multitex and copies the result to the outputs. Called by xxx_exec, which handles inputs. */ +/* Calls multitex and copies the result to the outputs. + * Called by xxx_exec, which handles inputs. */ static void do_proc(float *result, TexParams *p, const float col1[4], @@ -59,14 +60,16 @@ static void do_proc(float *result, if (is_normal) { texres.nor = result; } - else + else { texres.nor = NULL; + } textype = multitex_nodes( tex, p->co, p->dxt, p->dyt, p->osatex, &texres, thread, 0, p->mtex, NULL); - if (is_normal) + if (is_normal) { return; + } if (textype & TEX_RGB) { copy_v4_v4(result, &texres.tr); @@ -276,8 +279,9 @@ ProcDef(stucci) BKE_texture_default(tex); tex->type = node->type - TEX_NODE_PROC; - if (tex->type == TEX_WOOD) + if (tex->type == TEX_WOOD) { tex->stype = TEX_BANDNOISE; + } } /* Node type definitions */ |