diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-09 10:04:17 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-09 10:04:17 +0400 |
commit | dfdfa3d51b48a6bffd90779a1778dcf0e9a751e4 (patch) | |
tree | f51a4ea8668ee41182a5d60942e96804004d3c7a /source/blender/nodes | |
parent | 42517463821d0d0bbebe7c45bf40c06f4d8e9261 (diff) |
code cleanup: replace macros VECCOPY, VECADD, VECSUB, INPR - with BLI_math funcs.
added copy float/double funcs: copy_v3fl_v3db(), copy_v3db_v3fl(). 2d & 4d too.
Diffstat (limited to 'source/blender/nodes')
-rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_normal.c | 2 | ||||
-rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_normal.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_normal.c b/source/blender/nodes/composite/nodes/node_composite_normal.c index fbbd58932ea..638f67c4207 100644 --- a/source/blender/nodes/composite/nodes/node_composite_normal.c +++ b/source/blender/nodes/composite/nodes/node_composite_normal.c @@ -51,7 +51,7 @@ static void do_normal(bNode *node, float *out, float *in) float *nor= ((bNodeSocketValueVector*)sock->default_value)->value; /* render normals point inside... the widget points outside */ - out[0]= -INPR(nor, in); + out[0]= -dot_v3v3(nor, in); } /* generates normal, does dot product */ diff --git a/source/blender/nodes/shader/nodes/node_shader_normal.c b/source/blender/nodes/shader/nodes/node_shader_normal.c index 8515c99ba81..34213558317 100644 --- a/source/blender/nodes/shader/nodes/node_shader_normal.c +++ b/source/blender/nodes/shader/nodes/node_shader_normal.c @@ -68,7 +68,7 @@ static void node_shader_exec_normal(void *UNUSED(data), bNode *node, bNodeStack copy_v3_v3(out[0]->vec, ((bNodeSocketValueVector*)sock->default_value)->value); /* render normals point inside... the widget points outside */ - out[1]->vec[0]= -INPR(out[0]->vec, vec); + out[1]->vec[0]= -dot_v3v3(out[0]->vec, vec); } static int gpu_shader_normal(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out) |