[Bf-blender-cvs] [e6ab6cbae46] temp-cycles-denoising: Cycles Denoising: Change include path to make MSVC happy

[Lukas Stockner]

Commit: e6ab6cbae46a84164594ddba817b1852cd457f27
Author: Lukas Stockner
Date:   Mon Mar 27 02:13:08 2017 +0200
Branches: temp-cycles-denoising
https://developer.blender.org/rBe6ab6cbae46a84164594ddba817b1852cd457f27

Cycles Denoising: Change include path to make MSVC happy

Apparently there's a include conflict on Windows that causes it to use the wrong filter.h otherwise.

===================================================================

M	intern/cycles/device/device_cpu.cpp
M	intern/cycles/filter/kernels/cpu/filter.cpp
M	intern/cycles/filter/kernels/cpu/filter_avx.cpp
M	intern/cycles/filter/kernels/cpu/filter_avx2.cpp
M	intern/cycles/filter/kernels/cpu/filter_sse2.cpp
M	intern/cycles/filter/kernels/cpu/filter_sse3.cpp
M	intern/cycles/filter/kernels/cpu/filter_sse41.cpp

===================================================================

diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index 126f3fe90c4..9dbe9527fc1 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -35,7 +35,7 @@
 #include "split/kernel_split_data.h"
 #include "kernel_globals.h"
 
-#include "filter.h"
+#include "../filter/filter.h"
 
 #include "osl_shader.h"
 #include "osl_globals.h"
diff --git a/intern/cycles/filter/kernels/cpu/filter.cpp b/intern/cycles/filter/kernels/cpu/filter.cpp
index 29ce8f6efa3..ce490f85287 100644
--- a/intern/cycles/filter/kernels/cpu/filter.cpp
+++ b/intern/cycles/filter/kernels/cpu/filter.cpp
@@ -56,6 +56,6 @@
     /* do nothing */
 #endif
 
-#include "filter.h"
+#include "../filter/filter.h"
 #define KERNEL_ARCH cpu
 #include "filter_cpu_impl.h"
diff --git a/intern/cycles/filter/kernels/cpu/filter_avx.cpp b/intern/cycles/filter/kernels/cpu/filter_avx.cpp
index 2d3ed90330b..f1e95db872b 100644
--- a/intern/cycles/filter/kernels/cpu/filter_avx.cpp
+++ b/intern/cycles/filter/kernels/cpu/filter_avx.cpp
@@ -34,6 +34,6 @@
 #  endif
 #endif  /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX */
 
-#include "filter.h"
+#include "../filter/filter.h"
 #define KERNEL_ARCH cpu_avx
 #include "filter_cpu_impl.h"
diff --git a/intern/cycles/filter/kernels/cpu/filter_avx2.cpp b/intern/cycles/filter/kernels/cpu/filter_avx2.cpp
index 33f74b2054c..b446498fafa 100644
--- a/intern/cycles/filter/kernels/cpu/filter_avx2.cpp
+++ b/intern/cycles/filter/kernels/cpu/filter_avx2.cpp
@@ -35,6 +35,6 @@
 #  endif
 #endif  /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX2 */
 
-#include "filter.h"
+#include "../filter/filter.h"
 #define KERNEL_ARCH cpu_avx2
 #include "filter_cpu_impl.h"
diff --git a/intern/cycles/filter/kernels/cpu/filter_sse2.cpp b/intern/cycles/filter/kernels/cpu/filter_sse2.cpp
index 28dacf3770e..58a2c580c1b 100644
--- a/intern/cycles/filter/kernels/cpu/filter_sse2.cpp
+++ b/intern/cycles/filter/kernels/cpu/filter_sse2.cpp
@@ -29,6 +29,6 @@
 #  endif
 #endif  /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 */
 
-#include "filter.h"
+#include "../filter/filter.h"
 #define KERNEL_ARCH cpu_sse2
 #include "filter_cpu_impl.h"
diff --git a/intern/cycles/filter/kernels/cpu/filter_sse3.cpp b/intern/cycles/filter/kernels/cpu/filter_sse3.cpp
index 13d300ebf80..5c1973e9552 100644
--- a/intern/cycles/filter/kernels/cpu/filter_sse3.cpp
+++ b/intern/cycles/filter/kernels/cpu/filter_sse3.cpp
@@ -31,6 +31,6 @@
 #  endif
 #endif  /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE3 */
 
-#include "filter.h"
+#include "../filter/filter.h"
 #define KERNEL_ARCH cpu_sse3
 #include "filter_cpu_impl.h"
diff --git a/intern/cycles/filter/kernels/cpu/filter_sse41.cpp b/intern/cycles/filter/kernels/cpu/filter_sse41.cpp
index 06d3f25d292..e9bc7d4c3a2 100644
--- a/intern/cycles/filter/kernels/cpu/filter_sse41.cpp
+++ b/intern/cycles/filter/kernels/cpu/filter_sse41.cpp
@@ -32,6 +32,6 @@
 #  endif
 #endif  /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE41 */
 
-#include "filter.h"
+#include "../filter/filter.h"
 #define KERNEL_ARCH cpu_sse41
 #include "filter_cpu_impl.h"