[Bf-blender-cvs] [2c154399a21] master: Fix internal compiler error when building with VS 2017 (15.9.3).
Brecht Van Lommel
noreply at git.blender.org
Thu Nov 29 16:48:42 CET 2018
Commit: 2c154399a21a846223fe06975f7777a3c6a621bc
Author: Brecht Van Lommel
Date: Thu Nov 29 16:41:10 2018 +0100
Branches: master
https://developer.blender.org/rB2c154399a21a846223fe06975f7777a3c6a621bc
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.
===================================================================
M intern/cycles/util/util_profiling.h
===================================================================
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,
More information about the Bf-blender-cvs
mailing list