diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-06-11 22:56:47 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-06-12 00:50:11 +0300 |
commit | ebdd2e0b6d4cc8c2427070811a293a7e35a880c6 (patch) | |
tree | 353a26a6856194c2c9bad3cfd96d2a851475b59a /intern/cycles/kernel/shaders/node_math.osl | |
parent | b8112a896003d34ce1099c3cc8f4fee6bd3520cc (diff) |
Cycles: make shader node enums consistently lower case, update OSL shaders accordingly.
Diffstat (limited to 'intern/cycles/kernel/shaders/node_math.osl')
-rw-r--r-- | intern/cycles/kernel/shaders/node_math.osl | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/intern/cycles/kernel/shaders/node_math.osl b/intern/cycles/kernel/shaders/node_math.osl index 85eac0b97a6..f309ef7c6f3 100644 --- a/intern/cycles/kernel/shaders/node_math.osl +++ b/intern/cycles/kernel/shaders/node_math.osl @@ -49,7 +49,7 @@ float safe_log(float a, float b) } shader node_math( - string type = "Add", + string type = "add", int use_clamp = 0, float Value1 = 0.0, float Value2 = 0.0, @@ -57,43 +57,43 @@ shader node_math( { /* OSL asin, acos, pow check for values that could give rise to nan */ - if (type == "Add") + if (type == "add") Value = Value1 + Value2; - else if (type == "Subtract") + else if (type == "subtract") Value = Value1 - Value2; - else if (type == "Multiply") + else if (type == "multiply") Value = Value1 * Value2; - else if (type == "Divide") + else if (type == "divide") Value = safe_divide(Value1, Value2); - else if (type == "Sine") + else if (type == "sine") Value = sin(Value1); - else if (type == "Cosine") + else if (type == "cosine") Value = cos(Value1); - else if (type == "Tangent") + else if (type == "tangent") Value = tan(Value1); - else if (type == "Arcsine") + else if (type == "arcsine") Value = asin(Value1); - else if (type == "Arccosine") + else if (type == "arccosine") Value = acos(Value1); - else if (type == "Arctangent") + else if (type == "arctangent") Value = atan(Value1); - else if (type == "Power") + else if (type == "power") Value = pow(Value1, Value2); - else if (type == "Logarithm") + else if (type == "logarithm") Value = safe_log(Value1, Value2); - else if (type == "Minimum") + else if (type == "minimum") Value = min(Value1, Value2); - else if (type == "Maximum") + else if (type == "maximum") Value = max(Value1, Value2); - else if (type == "Round") + else if (type == "round") Value = floor(Value1 + 0.5); - else if (type == "Less Than") + else if (type == "less_than") Value = Value1 < Value2; - else if (type == "Greater Than") + else if (type == "greater_than") Value = Value1 > Value2; - else if (type == "Modulo") + else if (type == "modulo") Value = safe_modulo(Value1, Value2); - else if (type == "Absolute") + else if (type == "absolute") Value = fabs(Value1); if (use_clamp) |