From 2eb94be7503f0931d02a65243ae116d7879faa9c Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 27 Feb 2018 22:16:45 +0100 Subject: Code cleanup: refactor Cycles image metadata retrieval to use a struct. --- intern/cycles/blender/blender_session.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'intern/cycles/blender/blender_session.h') diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/blender_session.h index cbd2303d282..3804e07cffc 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; @@ -152,12 +153,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, -- cgit v1.2.3