From 4b9e05b42898073c65d97e20295a773f6ce7e78b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 15 Aug 2019 01:34:58 +1000 Subject: Cleanup: clang-format, sort structs & cmake files --- intern/cycles/kernel/shaders/node_clamp.osl | 5 ++--- intern/cycles/kernel/shaders/node_map_range.osl | 8 ++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'intern') diff --git a/intern/cycles/kernel/shaders/node_clamp.osl b/intern/cycles/kernel/shaders/node_clamp.osl index 43b0fe88172..87dc1ccdb12 100644 --- a/intern/cycles/kernel/shaders/node_clamp.osl +++ b/intern/cycles/kernel/shaders/node_clamp.osl @@ -16,8 +16,7 @@ #include "stdosl.h" -shader node_clamp(float Value = 1.0, float Min = 0.0, float Max = 1.0, - output float Result = 0.0) +shader node_clamp(float Value = 1.0, float Min = 0.0, float Max = 1.0, output float Result = 0.0) { - Result = clamp(Value, Min, Max); + Result = clamp(Value, Min, Max); } diff --git a/intern/cycles/kernel/shaders/node_map_range.osl b/intern/cycles/kernel/shaders/node_map_range.osl index 417d2ae50a8..8a28edf5f35 100644 --- a/intern/cycles/kernel/shaders/node_map_range.osl +++ b/intern/cycles/kernel/shaders/node_map_range.osl @@ -16,8 +16,12 @@ #include "stdosl.h" -shader node_map_range(float Value = 1.0, float FromMin = 0.0, float FromMax = 1.0, - float ToMin = 0.0, float ToMax = 1.0, output float Result = 0.0) +shader node_map_range(float Value = 1.0, + float FromMin = 0.0, + float FromMax = 1.0, + float ToMin = 0.0, + float ToMax = 1.0, + output float Result = 0.0) { if (FromMax != FromMin) { Result = ToMin + ((Value - FromMin) / (FromMax - FromMin)) * (ToMax - ToMin); -- cgit v1.2.3