diff options
| author | Matt Heimlich <matt.heimlich@gmail.com> | 2014-05-07 18:20:17 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-05-07 18:43:59 +0400 |
| commit | 3fbc984b069fed441cccdd3416ec71e064235e36 (patch) | |
| tree | 1c95f9d57457069eb3918deb727fc62b4c83dee5 /intern/cycles/kernel | |
| parent | 8b8d5a441f5815e83f83bacf8023e2cc3fbb2a04 (diff) | |
Nodes: add absolute value operation to all math nodes
Reviewed By: dingto, brecht
Differential Revision: https://developer.blender.org/D507
Diffstat (limited to 'intern/cycles/kernel')
| -rw-r--r-- | intern/cycles/kernel/shaders/node_math.osl | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_math.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_types.h | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/intern/cycles/kernel/shaders/node_math.osl b/intern/cycles/kernel/shaders/node_math.osl index 066e5f8dbe1..abb6a359e75 100644 --- a/intern/cycles/kernel/shaders/node_math.osl +++ b/intern/cycles/kernel/shaders/node_math.osl @@ -93,6 +93,8 @@ shader node_math( Value = Value1 > Value2; else if (type == "Modulo") Value = safe_modulo(Value1, Value2); + else if (type == "Absolute") + Value = fabs(Value1); if (Clamp) Value = clamp(Value, 0.0, 1.0); 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; |