Merge branch 'master' into blender2.8

2018-02-28 00:08:16 +01:00
parent bc71aa5a4c 2eb94be750
commit 11100faa5c
6 changed files with 165 additions and 167 deletions
--- 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,