diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-11 17:56:04 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-11 17:56:04 +0300 |
| commit | 4d115f21595d255f2d335d2f307ee822b381ea54 (patch) | |
| tree | dbbd84b1539f4b87df608cb3e7c84cfde5fcb3f6 /intern/cycles/render/image.h | |
| parent | 54e1d3815762ef964a74f179ef846110673e743f (diff) | |
| parent | 66d8bfb85c61aafe3bad2edf0e7b4d9d694ee2e7 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render/image.h')
| -rw-r--r-- | intern/cycles/render/image.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index 5d4e99401b2..d7fc31e3ab1 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 @@ -145,8 +146,7 @@ private: vector<Image*> 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<ImageInput> *in); template<TypeDesc::BASETYPE FileFormat, typename StorageType, |