diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-03-01 16:22:13 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-01 16:22:13 +0300 |
commit | 8901263b5f04152a9c6a897c5115acd51be11bf1 (patch) | |
tree | 14629685150a04440e2629fd45bd90891b8767ed /intern/cycles/util/util_math.h | |
parent | f64df0e1024c2447ad449d0bf63def871ee47925 (diff) | |
parent | 714e85b5344db7d9c9c7ac0a91cd0bb574c35353 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/util/util_math.h')
-rw-r--r-- | intern/cycles/util/util_math.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h index 2b81c8c498a..ae4b3d77f12 100644 --- a/intern/cycles/util/util_math.h +++ b/intern/cycles/util/util_math.h @@ -1329,7 +1329,7 @@ ccl_device_inline float3 safe_divide_even_color(float3 a, float3 b) y = (b.y != 0.0f)? a.y/b.y: 0.0f; z = (b.z != 0.0f)? a.z/b.z: 0.0f; - /* try to get grey even if b is zero */ + /* try to get gray even if b is zero */ if(b.x == 0.0f) { if(b.y == 0.0f) { x = z; |