[Bf-blender-cvs] [9525996321e] cycles_texture_cache: making things build on Linux

Stefan Werner noreply at git.blender.org
Mon Nov 27 20:40:29 CET 2017


Commit: 9525996321ecf4ec8236ed3542614cd6eb485a07
Author: Stefan Werner
Date:   Tue May 16 19:47:41 2017 +0200
Branches: cycles_texture_cache
https://developer.blender.org/rB9525996321ecf4ec8236ed3542614cd6eb485a07

making things build on Linux

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

M	intern/cycles/render/image.cpp
M	intern/cycles/render/shader.h

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

diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 56cc33a7200..3424d1dc405 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -29,7 +29,7 @@
 #endif
 
 #include "kernel/kernel_oiio_globals.h"
-#include <OpenImageIO/ImageBufAlgo.h>
+#include <OpenImageIO/imagebufalgo.h>
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h
index 7cd22e86b09..db32c43da81 100644
--- a/intern/cycles/render/shader.h
+++ b/intern/cycles/render/shader.h
@@ -33,6 +33,7 @@
 #include "util/util_string.h"
 #include "util/util_thread.h"
 #include "util/util_types.h"
+#include "kernel/kernel_oiio_globals.h"
 
 CCL_NAMESPACE_BEGIN



More information about the Bf-blender-cvs mailing list