diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
| commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
| tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /intern/cycles/util/util_types_uchar4_impl.h | |
| parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) | |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'intern/cycles/util/util_types_uchar4_impl.h')
| -rw-r--r-- | intern/cycles/util/util_types_uchar4_impl.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/intern/cycles/util/util_types_uchar4_impl.h b/intern/cycles/util/util_types_uchar4_impl.h index 03039f60c54..79879f176a6 100644 --- a/intern/cycles/util/util_types_uchar4_impl.h +++ b/intern/cycles/util/util_types_uchar4_impl.h @@ -26,25 +26,25 @@ CCL_NAMESPACE_BEGIN #ifndef __KERNEL_GPU__ uchar uchar4::operator[](int i) const { - util_assert(i >= 0); - util_assert(i < 4); - return *(&x + i); + util_assert(i >= 0); + util_assert(i < 4); + return *(&x + i); } -uchar& uchar4::operator[](int i) +uchar &uchar4::operator[](int i) { - util_assert(i >= 0); - util_assert(i < 4); - return *(&x + i); + util_assert(i >= 0); + util_assert(i < 4); + return *(&x + i); } ccl_device_inline uchar4 make_uchar4(uchar x, uchar y, uchar z, uchar w) { - uchar4 a = {x, y, z, w}; - return a; + uchar4 a = {x, y, z, w}; + return a; } -#endif /* __KERNEL_GPU__ */ +#endif /* __KERNEL_GPU__ */ CCL_NAMESPACE_END -#endif /* __UTIL_TYPES_UCHAR4_IMPL_H__ */ +#endif /* __UTIL_TYPES_UCHAR4_IMPL_H__ */ |