diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2018-06-14 23:54:42 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2018-06-14 23:54:42 +0300 |
| commit | 27de412ca8de4edad99a46ebdb8aadd7003e42a6 (patch) | |
| tree | 4e2659e3490519021195ba626de74adc4813e825 /intern/cycles/render/image.h | |
| parent | 525be2f579c994777328bd7ac206be4769d3e6a4 (diff) | |
| parent | 3ee606621cf53a2a4897e534e7e04d3632f419f8 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
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 66f929aa03a..59b9f9ea28d 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, @@ -114,7 +116,7 @@ public: struct Image { string filename; void *builtin_data; - bool builtin_free_cache; + ImageMetaData metadata; bool use_alpha; bool need_load; @@ -141,11 +143,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, |