[Bf-blender-cvs] [0dd708bc1b] temp-cycles-denoising: Merge branch 'origin/master' into temp-cycles-denoising

[Lukas Stockner]

Commit: 0dd708bc1b2bf8555a1708b3529ef7dcccf3a05d
Author: Lukas Stockner
Date:   Fri Mar 24 19:51:04 2017 +0100
Branches: temp-cycles-denoising
https://developer.blender.org/rB0dd708bc1b2bf8555a1708b3529ef7dcccf3a05d

Merge branch 'origin/master' into temp-cycles-denoising

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



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

diff --cc intern/cycles/render/tile.cpp
index daa7811938,76d0b9a57c..321760a314
--- a/intern/cycles/render/tile.cpp
+++ b/intern/cycles/render/tile.cpp
@@@ -142,14 -129,10 +142,13 @@@ void TileManager::reset(BufferParams& p
  	set_samples(num_samples_);
  
  	state.buffer = BufferParams();
 +	state.global_buffers = NULL;
  	state.sample = range_start_sample - 1;
  	state.num_tiles = 0;
- 	state.num_rendered_tiles = 0;
  	state.num_samples = 0;
  	state.resolution_divider = get_divider(params.width, params.height, start_resolution);
 +	state.render_tiles.clear();
 +	state.denoising_tiles.clear();
  	state.tiles.clear();
  }
  
@@@ -454,23 -337,11 +453,22 @@@ bool TileManager::next_tile(Tile* &tile
  {
  	int logical_device = preserve_tile_device? device: 0;
  
 -	if((logical_device >= state.tiles.size()) || state.tiles[logical_device].empty())
 +	if(logical_device >= state.render_tiles.size())
 +		return false;
 +
 +	if(!state.denoising_tiles[logical_device].empty()) {
 +		int idx = state.denoising_tiles[logical_device].front();
 +		state.denoising_tiles[logical_device].pop_front();
 +		tile = &state.tiles[idx];
 +		return true;
 +	}
 +
 +	if(state.render_tiles[logical_device].empty())
  		return false;
  
 -	tile = Tile(state.tiles[logical_device].front());
 -	state.tiles[logical_device].pop_front();
 +	int idx = state.render_tiles[logical_device].front();
 +	state.render_tiles[logical_device].pop_front();
 +	tile = &state.tiles[idx];
- 	state.num_rendered_tiles++;
  	return true;
  }