diff options
author | Ray Molenkamp <github@lazydodo.com> | 2018-07-23 01:03:46 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2018-07-23 01:03:46 +0300 |
commit | cdce3b71df3a18cb0970b2aa78aea6bf644e4fce (patch) | |
tree | d5a169c83762d1c8135a025eab585fa8b5fffa16 /intern/cycles/util | |
parent | f07140940c4ef5c062fbf1c2f7d3743b3d1fd29e (diff) | |
parent | 7232b0cbe51865653fdb3ea6b968345dd8fbc525 (diff) |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'intern/cycles/util')
-rw-r--r-- | intern/cycles/util/util_math_float3.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/util/util_math_float3.h b/intern/cycles/util/util_math_float3.h index ba1c117cdea..75265c1c9a2 100644 --- a/intern/cycles/util/util_math_float3.h +++ b/intern/cycles/util/util_math_float3.h @@ -280,11 +280,6 @@ ccl_device_inline float3 sqrt(const float3& a) #endif } -ccl_device_inline float3 pow3(const float3& a, float e) -{ - return make_float3(powf(a.x, e), powf(a.y, e), powf(a.z, e)); -} - ccl_device_inline float3 mix(const float3& a, const float3& b, float t) { return a + t*(b - a); @@ -382,6 +377,11 @@ ccl_device_inline bool isequal_float3(const float3 a, const float3 b) #endif } +ccl_device_inline float3 pow3(float3 v, float e) +{ + return make_float3(powf(v.x, e), powf(v.y, e), powf(v.z, e)); +} + ccl_device_inline float3 exp3(float3 v) { return make_float3(expf(v.x), expf(v.y), expf(v.z)); |