Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Heimlich <matt.heimlich@gmail.com>2014-05-07 18:20:17 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2014-05-07 18:43:59 +0400
commit3fbc984b069fed441cccdd3416ec71e064235e36 (patch)
tree1c95f9d57457069eb3918deb727fc62b4c83dee5 /source/blender/nodes/shader
parent8b8d5a441f5815e83f83bacf8023e2cc3fbb2a04 (diff)
Nodes: add absolute value operation to all math nodes
Reviewed By: dingto, brecht Differential Revision: https://developer.blender.org/D507
Diffstat (limited to 'source/blender/nodes/shader')
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_math.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_math.c b/source/blender/nodes/shader/nodes/node_shader_math.c
index b6c755571c0..ed88e800d33 100644
--- a/source/blender/nodes/shader/nodes/node_shader_math.c
+++ b/source/blender/nodes/shader/nodes/node_shader_math.c
@@ -216,6 +216,11 @@ static void node_shader_exec_math(void *UNUSED(data), int UNUSED(thread), bNode
r = fmod(a, b);
break;
}
+ case 18: /* Absolute */
+ {
+ r = fabs(a);
+ break;
+ }
}
out[0]->vec[0] = r;
@@ -226,7 +231,7 @@ static int gpu_shader_math(GPUMaterial *mat, bNode *node, bNodeExecData *UNUSED(
static const char *names[] = {"math_add", "math_subtract", "math_multiply",
"math_divide", "math_sine", "math_cosine", "math_tangent", "math_asin",
"math_acos", "math_atan", "math_pow", "math_log", "math_min", "math_max",
- "math_round", "math_less_than", "math_greater_than", "math_modulo"};
+ "math_round", "math_less_than", "math_greater_than", "math_modulo", "math_absolute"};
switch (node->custom1) {
case 0: