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

[Lukas Stockner]

Commit: 51e9b190c8f8c4bce54006c45461737e790bbb97
Author: Lukas Stockner
Date:   Tue Nov 22 04:12:44 2016 +0100
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rB51e9b190c8f8c4bce54006c45461737e790bbb97

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

Conflicts:
	intern/cycles/blender/blender_session.cpp

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



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

diff --cc intern/cycles/blender/blender_session.cpp
index 4dadc63,171153d..fa33a9d
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@@ -477,27 -499,8 +478,28 @@@ void BlenderSession::render(
  		scene->film->tag_update(scene);
  		scene->integrator->tag_update(scene);
  
 +		if(b_layer_iter->keep_denoise_data()) {
 +			add_pass(b_engine, SCE_PASS_DENOISE_NORMAL, 3, b_rlay_name.c_str(), NULL);
 +			add_pass(b_engine, SCE_PASS_DENOISE_NORMAL_VAR, 3, b_rlay_name.c_str(), NULL);
 +			add_pass(b_engine, SCE_PASS_DENOISE_ALBEDO, 3, b_rlay_name.c_str(), NULL);
 +			add_pass(b_engine, SCE_PASS_DENOISE_ALBEDO_VAR, 3, b_rlay_name.c_str(), NULL);
 +			add_pass(b_engine, SCE_PASS_DENOISE_DEPTH, 1, b_rlay_name.c_str(), NULL);
 +			add_pass(b_engine, SCE_PASS_DENOISE_DEPTH_VAR, 1, b_rlay_name.c_str(), NULL);
 +			add_pass(b_engine, SCE_PASS_DENOISE_SHADOW_A, 3, b_rlay_name.c_str(), NULL);
 +			add_pass(b_engine, SCE_PASS_DENOISE_SHADOW_B, 3, b_rlay_name.c_str(), NULL);
 +			add_pass(b_engine, SCE_PASS_DENOISE_NOISY, 3, b_rlay_name.c_str(), NULL);
 +			add_pass(b_engine, SCE_PASS_DENOISE_NOISY_VAR, 3, b_rlay_name.c_str(), NULL);
 +			if(buffer_params.cross_denoising) {
 +				add_pass(b_engine, SCE_PASS_DENOISE_NOISY_B, 3, b_rlay_name.c_str(), NULL);
 +				add_pass(b_engine, SCE_PASS_DENOISE_NOISY_B_VAR, 3, b_rlay_name.c_str(), NULL);
 +			}
 +			if(buffer_params.selective_denoising) {
 +				add_pass(b_engine, SCE_PASS_DENOISE_CLEAN, 3, b_rlay_name.c_str(), NULL);
 +			}
 +		}
 +
- 		for(b_rr.views.begin(b_view_iter); b_view_iter != b_rr.views.end(); ++b_view_iter) {
+ 		int view_index = 0;
+ 		for(b_rr.views.begin(b_view_iter); b_view_iter != b_rr.views.end(); ++b_view_iter, ++view_index) {
  			b_rview_name = b_view_iter->name();
  
  			/* set the current view */