diff options
Diffstat (limited to 'intern/cycles/render/image.h')
-rw-r--r-- | intern/cycles/render/image.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index 5391490d993..4fd09adaa64 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -71,6 +71,8 @@ public: bool get_image_metadata(const string& filename, void *builtin_data, ImageMetaData& metadata); + bool get_image_metadata(int flat_slot, + ImageMetaData& metadata); void device_update(Device *device, Scene *scene, @@ -110,7 +112,7 @@ public: struct Image { string filename; void *builtin_data; - bool builtin_free_cache; + ImageMetaData metadata; bool use_alpha; bool need_load; @@ -137,11 +139,7 @@ private: void *osl_texture_system; bool file_load_image_generic(Image *img, - ImageInput **in, - int &width, - int &height, - int &depth, - int &components); + ImageInput **in); template<TypeDesc::BASETYPE FileFormat, typename StorageType, |