diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-29 18:49:21 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-29 18:49:21 +0300 |
| commit | 7c6fc8b275abba98c3577cf2e9a7caca043f6a7b (patch) | |
| tree | 47d0e72df3483eb1503861ad5d55c44239e188c4 /intern/cycles/util | |
| parent | 1f5216c57ae2f7896c9392668fae5019e481c723 (diff) | |
| parent | 2c154399a21a846223fe06975f7777a3c6a621bc (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/util')
| -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, |