Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / blender / blender_session.h
index 254e8a049ffa88e661aaea06b2437a9068d5672f..5edf44d087e2ba6f8a26b6f314fbb35896c59e27 100644 (file)
@@ -159,15 +159,18 @@ protected:
                                int &width,
                                int &height,
                                int &depth,
-                               int &channels);
+                               int &channels,
+                               bool &free_cache);
        bool builtin_image_pixels(const string &builtin_name,
                                  void *builtin_data,
                                  unsigned char *pixels,
-                                 const size_t pixels_size);
+                                 const size_t pixels_size,
+                                 const bool free_cache);
        bool builtin_image_float_pixels(const string &builtin_name,
                                        void *builtin_data,
                                        float *pixels,
-                                       const size_t pixels_size);
+                                       const size_t pixels_size,
+                                       const bool free_cache);
 
        /* Update tile manager to reflect resumable render settings. */
        void update_resumable_tile_manager(int num_samples);