diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-03-10 04:42:47 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-03-10 04:42:47 +0400 |
| commit | 56538ea685672fd882bbac81b0b4223dfaa3f7ce (patch) | |
| tree | 31a2ebbbdb918b2d738c69775803cf5868e8b8ea /intern/cycles/kernel/shaders/node_math.osl | |
| parent | 5ac628fb477aaf2c2f0ee8ab5c25fb850a4c0a2a (diff) | |
Cycles / OSL:
* More small improvements: return immediately, and use "else if".
Diffstat (limited to 'intern/cycles/kernel/shaders/node_math.osl')
| -rw-r--r-- | intern/cycles/kernel/shaders/node_math.osl | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/intern/cycles/kernel/shaders/node_math.osl b/intern/cycles/kernel/shaders/node_math.osl index 24dce898fd2..2ec1a5f0a32 100644 --- a/intern/cycles/kernel/shaders/node_math.osl +++ b/intern/cycles/kernel/shaders/node_math.osl @@ -49,37 +49,37 @@ shader node_math( if (type == "Add") Value = Value1 + Value2; - if (type == "Subtract") + else if (type == "Subtract") Value = Value1 - Value2; - if (type == "Multiply") + else if (type == "Multiply") Value = Value1 * Value2; - if (type == "Divide") + else if (type == "Divide") Value = safe_divide(Value1, Value2); - if (type == "Sine") + else if (type == "Sine") Value = sin(Value1); - if (type == "Cosine") + else if (type == "Cosine") Value = cos(Value1); - if (type == "Tangent") + else if (type == "Tangent") Value = tan(Value1); - if (type == "Arcsine") + else if (type == "Arcsine") Value = asin(Value1); - if (type == "Arccosine") + else if (type == "Arccosine") Value = acos(Value1); - if (type == "Arctangent") + else if (type == "Arctangent") Value = atan(Value1); - if (type == "Power") + else if (type == "Power") Value = pow(Value1, Value2); - if (type == "Logarithm") + else if (type == "Logarithm") Value = safe_log(Value1, Value2); - if (type == "Minimum") + else if (type == "Minimum") Value = min(Value1, Value2); - if (type == "Maximum") + else if (type == "Maximum") Value = max(Value1, Value2); - if (type == "Round") + else if (type == "Round") Value = floor(Value1 + 0.5); - if (type == "Less Than") + else if (type == "Less Than") Value = Value1 < Value2; - if (type == "Greater Than") + else if (type == "Greater Than") Value = Value1 > Value2; if (Clamp) |