From 3fbc984b069fed441cccdd3416ec71e064235e36 Mon Sep 17 00:00:00 2001 From: Matt Heimlich Date: Wed, 7 May 2014 16:20:17 +0200 Subject: Nodes: add absolute value operation to all math nodes Reviewed By: dingto, brecht Differential Revision: https://developer.blender.org/D507 --- intern/cycles/kernel/svm/svm_math.h | 2 ++ intern/cycles/kernel/svm/svm_types.h | 1 + 2 files changed, 3 insertions(+) (limited to 'intern/cycles/kernel/svm') diff --git a/intern/cycles/kernel/svm/svm_math.h b/intern/cycles/kernel/svm/svm_math.h index bb46d443a6b..1ce9386e40e 100644 --- a/intern/cycles/kernel/svm/svm_math.h +++ b/intern/cycles/kernel/svm/svm_math.h @@ -56,6 +56,8 @@ ccl_device float svm_math(NodeMath type, float Fac1, float Fac2) Fac = Fac1 > Fac2; else if(type == NODE_MATH_MODULO) Fac = safe_modulo(Fac1, Fac2); + else if(type == NODE_MATH_ABSOLUTE) + Fac = fabsf(Fac1); else if(type == NODE_MATH_CLAMP) Fac = clamp(Fac1, 0.0f, 1.0f); else diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h index a7deb0bb913..80972ec82bc 100644 --- a/intern/cycles/kernel/svm/svm_types.h +++ b/intern/cycles/kernel/svm/svm_types.h @@ -221,6 +221,7 @@ typedef enum NodeMath { NODE_MATH_LESS_THAN, NODE_MATH_GREATER_THAN, NODE_MATH_MODULO, + NODE_MATH_ABSOLUTE, NODE_MATH_CLAMP /* used for the clamp UI option */ } NodeMath; -- cgit v1.2.3