diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-01-02 22:04:10 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-01-02 22:11:28 +0300 |
commit | 1369bd562cfe31fdec8a1755d2f0506d8373d7ad (patch) | |
tree | ca8011eec93371025f3b5fb3d7543d84d5afac50 /intern | |
parent | 8e37a45ac06fe8f26f4eecaaa1a263fbe5012a06 (diff) |
Cycles: Fix compilation error on AVX platforms with -arch-native
Was a conflict in headers between clew and util_optimization.h.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/device/device.cpp | 3 | ||||
-rw-r--r-- | intern/cycles/device/device_opencl.cpp | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 011e90b36aa..e6e6befd72c 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -20,9 +20,6 @@ #include "device.h" #include "device_intern.h" -#include "cuew.h" -#include "clew.h" - #include "util_debug.h" #include "util_foreach.h" #include "util_half.h" diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index 371008dea62..506238556ab 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -20,13 +20,13 @@ #include <stdlib.h> #include <string.h> +#include "clew.h" + #include "device.h" #include "device_intern.h" #include "buffers.h" -#include "clew.h" - #include "util_foreach.h" #include "util_map.h" #include "util_math.h" |