diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-28 02:08:16 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-28 02:08:16 +0300 |
| commit | 11100faa5cfbeb735194c6d2d5ed951dc5ae063a (patch) | |
| tree | c27c2047640aa4773ea7953ee8bed06d7bec4a30 /intern/cycles/blender/blender_session.h | |
| parent | bc71aa5a4c5e0ce961803d7d0b7649ad6d384006 (diff) | |
| parent | 2eb94be7503f0931d02a65243ae116d7879faa9c (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/blender/blender_session.h')
| -rw-r--r-- | intern/cycles/blender/blender_session.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/blender_session.h index bd71087c16a..77a64031da1 100644 --- a/intern/cycles/blender/blender_session.h +++ b/intern/cycles/blender/blender_session.h @@ -26,6 +26,7 @@ CCL_NAMESPACE_BEGIN +class ImageMetaData; class Scene; class Session; class RenderBuffers; @@ -153,12 +154,7 @@ protected: int builtin_image_frame(const string &builtin_name); void builtin_image_info(const string &builtin_name, void *builtin_data, - bool &is_float, - int &width, - int &height, - int &depth, - int &channels, - bool &free_cache); + ImageMetaData& metadata); bool builtin_image_pixels(const string &builtin_name, void *builtin_data, unsigned char *pixels, |