From 66d8bfb85c61aafe3bad2edf0e7b4d9d694ee2e7 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 11 Dec 2018 12:17:26 +0100 Subject: Update code to be compatible with OIIO 2.0 There are some changes in API of OpenImageIO, but those are quite simple to keep working with older and newer library versions. Reviewers: brecht Reviewed By: brecht Differential Revision: https://developer.blender.org/D4064 --- intern/cycles/render/image.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intern/cycles/render/image.h') diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index 8367a6811bd..b608bc30e70 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -23,6 +23,7 @@ #include "util/util_image.h" #include "util/util_string.h" #include "util/util_thread.h" +#include "util/util_unique_ptr.h" #include "util/util_vector.h" CCL_NAMESPACE_BEGIN @@ -141,8 +142,7 @@ private: vector images[IMAGE_DATA_NUM_TYPES]; void *osl_texture_system; - bool file_load_image_generic(Image *img, - ImageInput **in); + bool file_load_image_generic(Image *img, unique_ptr *in); template