diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-14 05:13:55 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-14 05:13:55 +0300 |
| commit | 230be97284de444e6b2566f535141ca31647f6ab (patch) | |
| tree | 2cedfed045fb8c015d0fe4fbf65de5623fff1a55 /intern/cycles/util | |
| parent | eccaa6da26b8fc58481367524725413349dd9059 (diff) | |
| parent | a8fbe991cd5293f077fa946296b6caad18d0f5ab (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h index 733b97e1432..aabca6c81fc 100644 --- a/intern/cycles/util/util_types.h +++ b/intern/cycles/util/util_types.h @@ -28,9 +28,9 @@ #endif #include "util/util_defines.h" -#include "util/util_optimization.h" #ifndef __KERNEL_GPU__ +# include "util/util_optimization.h" # include "util/util_simd.h" #endif |