summarylogtreecommitdiffstats
path: root/opencolorio1.patch
blob: 89fbbd65455da297e900b4ebd40c379ef87ea141 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
diff --git a/build_files/cmake/Modules/FindOpenColorIO.cmake b/build_files/cmake/Modules/FindOpenColorIO.cmake
index 090032e06ec..f5db181d73d 100644
--- a/build_files/cmake/Modules/FindOpenColorIO.cmake
+++ b/build_files/cmake/Modules/FindOpenColorIO.cmake
@@ -28,7 +28,7 @@ IF(NOT OPENCOLORIO_ROOT_DIR AND NOT $ENV{OPENCOLORIO_ROOT_DIR} STREQUAL "")
 ENDIF()
 
 SET(_opencolorio_FIND_COMPONENTS
-  OpenColorIO
+  OpenColorIO1
   yaml-cpp
   tinyxml
 )
@@ -40,7 +40,7 @@ SET(_opencolorio_SEARCH_DIRS
 
 FIND_PATH(OPENCOLORIO_INCLUDE_DIR
   NAMES
-    OpenColorIO/OpenColorIO.h
+    OpenColorIO1/OpenColorIO.h
   HINTS
     ${_opencolorio_SEARCH_DIRS}
   PATH_SUFFIXES
diff --git a/intern/opencolorio/ocio_impl.cc b/intern/opencolorio/ocio_impl.cc
index 0e25c89f5d7..f1f99de4bd8 100644
--- a/intern/opencolorio/ocio_impl.cc
+++ b/intern/opencolorio/ocio_impl.cc
@@ -26,7 +26,7 @@
 #  pragma warning(push)
 #  pragma warning(disable : 4251 4275)
 #endif
-#include <OpenColorIO/OpenColorIO.h>
+#include <OpenColorIO1/OpenColorIO.h>
 #ifdef _MSC_VER
 #  pragma warning(pop)
 #endif
diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc
index df6adc8f34b..24d1ec8a871 100644
--- a/intern/opencolorio/ocio_impl_glsl.cc
+++ b/intern/opencolorio/ocio_impl_glsl.cc
@@ -40,7 +40,7 @@
 #  pragma warning(push)
 #  pragma warning(disable : 4251 4275)
 #endif
-#include <OpenColorIO/OpenColorIO.h>
+#include <OpenColorIO1/OpenColorIO.h>
 #ifdef _MSC_VER
 #  pragma warning(pop)
 #endif
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index 8403a636e1c..54abe4cfa3c 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -35,7 +35,7 @@
 #include "util/util_murmurhash.h"
 
 #ifdef WITH_OCIO
-#  include <OpenColorIO/OpenColorIO.h>
+#  include <OpenColorIO1/OpenColorIO.h>
 namespace OCIO = OCIO_NAMESPACE;
 #endif