diff options
Diffstat (limited to 'intern/cycles/render/merge.cpp')
| -rw-r--r-- | intern/cycles/render/merge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/merge.cpp b/intern/cycles/render/merge.cpp index cac07e59fe3..3ea3952b96c 100644 --- a/intern/cycles/render/merge.cpp +++ b/intern/cycles/render/merge.cpp @@ -22,8 +22,8 @@ #include "util/util_time.h" #include "util/util_unique_ptr.h" -#include <OpenImageIO/imageio.h> #include <OpenImageIO/filesystem.h> +#include <OpenImageIO/imageio.h> OIIO_NAMESPACE_USING |