[Bf-blender-cvs] [8c8b81d] soc-2016-cycles_denoising: Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising

[Lukas Stockner]

Commit: 8c8b81dfdb3c0529be4cf4a16a3310e6ec26db0a
Author: Lukas Stockner
Date:   Fri Dec 2 22:14:52 2016 +0100
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rB8c8b81dfdb3c0529be4cf4a16a3310e6ec26db0a

Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising

===================================================================



===================================================================

diff --cc intern/cycles/blender/blender_session.h
index e579f55,82fe218..cf8def6
--- a/intern/cycles/blender/blender_session.h
+++ b/intern/cycles/blender/blender_session.h
@@@ -149,12 -142,24 +149,24 @@@ protected
  	                                   BL::RenderLayer& b_rlay,
  	                                   RenderTile& rtile,
  	                                   bool do_update_only);
 -	void do_write_update_render_tile(RenderTile& rtile, bool do_update_only);
 +	void do_write_update_render_tile(RenderTile& rtile, bool do_update_only, bool highlight);
  
  	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 builtin_image_pixels(const string &builtin_name, void *builtin_data, unsigned char *pixels);
- 	bool builtin_image_float_pixels(const string &builtin_name, void *builtin_data, float *pixels);
+ 	void builtin_image_info(const string &builtin_name,
+ 	                        void *builtin_data,
+ 	                        bool &is_float,
+ 	                        int &width,
+ 	                        int &height,
+ 	                        int &depth,
+ 	                        int &channels);
+ 	bool builtin_image_pixels(const string &builtin_name,
+ 	                          void *builtin_data,
+ 	                          unsigned char *pixels,
+ 	                          const size_t pixels_size);
+ 	bool builtin_image_float_pixels(const string &builtin_name,
+ 	                                void *builtin_data,
+ 	                                float *pixels,
+ 	                                const size_t pixels_size);
  
  	/* Update tile manager to reflect resumable render settings. */
  	void update_resumable_tile_manager(int num_samples);