Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'intern/cycles/device/cpu/device_impl.h')
-rw-r--r--intern/cycles/device/cpu/device_impl.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/device/cpu/device_impl.h b/intern/cycles/device/cpu/device_impl.h
index 944c61e29f7..553728ccc3b 100644
--- a/intern/cycles/device/cpu/device_impl.h
+++ b/intern/cycles/device/cpu/device_impl.h
@@ -19,7 +19,7 @@
/* So ImathMath is included before our kernel_cpu_compat. */
#ifdef WITH_OSL
/* So no context pollution happens from indirectly included windows.h */
-# include "util/util_windows.h"
+# include "util/windows.h"
# include <OSL/oslexec.h>
#endif
@@ -29,15 +29,15 @@
#include "device/cpu/kernel.h"
#include "device/device.h"
-#include "device/device_memory.h"
+#include "device/memory.h"
// clang-format off
#include "kernel/device/cpu/compat.h"
#include "kernel/device/cpu/kernel.h"
#include "kernel/device/cpu/globals.h"
-#include "kernel/osl/osl_shader.h"
-#include "kernel/osl/osl_globals.h"
+#include "kernel/osl/shader.h"
+#include "kernel/osl/globals.h"
// clang-format on
CCL_NAMESPACE_BEGIN