diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-02 13:46:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-02 13:46:14 +0300 |
| commit | d09920687c4474f5f6ccf0f089d359f69932afac (patch) | |
| tree | 3fa95c573d162f2b228d1165b66f9bb6d41cf538 /intern/cycles/util | |
| parent | adc17317c5af23c0986a449da6d0aef130d1f503 (diff) | |
| parent | 128506eeb1a2d87393061b4c9783289a5e4b3275 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_math_float3.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/util/util_math_float3.h b/intern/cycles/util/util_math_float3.h index a0a62ae95df..f5149fe13ed 100644 --- a/intern/cycles/util/util_math_float3.h +++ b/intern/cycles/util/util_math_float3.h @@ -67,7 +67,7 @@ ccl_device_inline float len_squared(const float3 a); ccl_device_inline float3 saturate3(float3 a); ccl_device_inline float3 safe_normalize(const float3 a); -ccl_device_inline float3 normalize_len(const float3 a, float *t);; +ccl_device_inline float3 normalize_len(const float3 a, float *t); ccl_device_inline float3 safe_normalize_len(const float3 a, float *t); ccl_device_inline float3 interp(float3 a, float3 b, float t); |