diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-10-16 03:11:59 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-16 03:11:59 +0400 |
| commit | 92862f96dc537242f66a6b5ebe0fc3f835acada0 (patch) | |
| tree | fea4747aa87c396769ddbfa8d43a906ed8dec327 /source/blender/nodes/texture/nodes/node_texture_proc.c | |
| parent | 59ea74fd6f5ac027d9b9e94132e2dd0a2bef7504 (diff) | |
code cleanup: use float sizes for function args.
Diffstat (limited to 'source/blender/nodes/texture/nodes/node_texture_proc.c')
| -rw-r--r-- | source/blender/nodes/texture/nodes/node_texture_proc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/nodes/texture/nodes/node_texture_proc.c b/source/blender/nodes/texture/nodes/node_texture_proc.c index 102f6e1c428..1f724292661 100644 --- a/source/blender/nodes/texture/nodes/node_texture_proc.c +++ b/source/blender/nodes/texture/nodes/node_texture_proc.c @@ -57,7 +57,7 @@ static bNodeSocketTemplate outputs_color_only[]= { { 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. */ -static void do_proc(float *result, TexParams *p, float *col1, float *col2, char is_normal, Tex *tex, short thread) +static void do_proc(float *result, TexParams *p, const float col1[4], const float col2[4], char is_normal, Tex *tex, const short thread) { TexResult texres; int textype; @@ -69,7 +69,7 @@ static void do_proc(float *result, TexParams *p, float *col1, float *col2, char texres.nor = NULL; textype = multitex_nodes(tex, p->co, p->dxt, p->dyt, p->osatex, - &texres, thread, 0, p->shi, p->mtex); + &texres, thread, 0, p->shi, p->mtex); if (is_normal) return; @@ -83,7 +83,7 @@ static void do_proc(float *result, TexParams *p, float *col1, float *col2, char } } -typedef void (*MapFn) (Tex *tex, bNodeStack **in, TexParams *p, short thread); +typedef void (*MapFn) (Tex *tex, bNodeStack **in, TexParams *p, const short thread); static void texfn( float *result, |