diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-29 18:41:10 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-29 18:42:52 +0300 |
| commit | 2c154399a21a846223fe06975f7777a3c6a621bc (patch) | |
| tree | aba9dda566f814840ec0f04e968ca99ae80e3fe7 /intern/cycles/util/util_profiling.h | |
| parent | b00819bcca0c7b98af7e7e1717ccbedc2a426d57 (diff) | |
Fix internal compiler error when building with VS 2017 (15.9.3).
It doesn't like alignment for function arguments, and I don't think this
alignment is needed.
Solution found by Ray Molenkamp.
Diffstat (limited to 'intern/cycles/util/util_profiling.h')
| -rw-r--r-- | intern/cycles/util/util_profiling.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/util/util_profiling.h b/intern/cycles/util/util_profiling.h index 4460402b12d..77cdbb0b325 100644 --- a/intern/cycles/util/util_profiling.h +++ b/intern/cycles/util/util_profiling.h @@ -26,7 +26,7 @@ CCL_NAMESPACE_BEGIN -enum ccl_try_align(16) ProfilingEvent : uint32_t { +enum ProfilingEvent : uint32_t { PROFILING_UNKNOWN, PROFILING_RAY_SETUP, PROFILING_PATH_INTEGRATE, |