sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: Fix compilation error on AVX platforms with -arch-native

Browse Source 
Was a conflict in headers between clew and util_optimization.h.
This commit is contained in:
Sergey Sharybin 2015-01-03 00:04:10 +05:00
parent 8e37a45ac0
commit 1369bd562c
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
intern/cycles/device/device.cpp
View File

@ -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"

4
intern/cycles/device/device_opencl.cpp
View File

@ -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"