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:
authorBrecht Van Lommel <brecht@blender.org>2020-03-11 19:59:32 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-03-11 22:35:38 +0300
commit5a169ae2f327f366137b6cefd2da75287f761a4f (patch)
tree5a967c6406ae297ebc0820c1895b3464342bc21f /intern/cycles/blender
parent21821601f2886fa30ae38a60a3562a85f24ba9a4 (diff)
Cleanup: remove foreach include from header, conflicts with OpenVDB
Diffstat (limited to 'intern/cycles/blender')
-rw-r--r--intern/cycles/blender/blender_device.cpp2
-rw-r--r--intern/cycles/blender/blender_geometry.cpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_device.cpp b/intern/cycles/blender/blender_device.cpp
index d0f8465a98f..5140f190f36 100644
--- a/intern/cycles/blender/blender_device.cpp
+++ b/intern/cycles/blender/blender_device.cpp
@@ -17,6 +17,8 @@
#include "blender/blender_device.h"
#include "blender/blender_util.h"
+#include "util/util_foreach.h"
+
CCL_NAMESPACE_BEGIN
enum DenoiserType {
diff --git a/intern/cycles/blender/blender_geometry.cpp b/intern/cycles/blender/blender_geometry.cpp
index 304b3d18e27..e2a4a125ca1 100644
--- a/intern/cycles/blender/blender_geometry.cpp
+++ b/intern/cycles/blender/blender_geometry.cpp
@@ -23,6 +23,8 @@
#include "blender/blender_sync.h"
#include "blender/blender_util.h"
+#include "util/util_foreach.h"
+
CCL_NAMESPACE_BEGIN
Geometry *BlenderSync::sync_geometry(BL::Depsgraph &b_depsgraph,