[Bf-blender-cvs] [3cb5a07] multiview: Revert "From review: Cycles: use scene.views instead of render_result.views"

[Dalai Felinto]

Commit: 3cb5a07783d547102b15083ff2e7d1b47ba1d668
Author: Dalai Felinto
Date:   Thu Mar 19 16:32:51 2015 +0100
Branches: multiview
https://developer.blender.org/rB3cb5a07783d547102b15083ff2e7d1b47ba1d668

Revert "From review: Cycles: use scene.views instead of render_result.views"

This reverts commit 43e10a6853e4659429d000225b93862708414b31.

render_result.views is already taken into account whether the views are enabled,
if they can be rendered (e.g., Stereo mode shows only left and right) and when
multiview is off, it has a "" fallback view.

Leaving it as it was for the time being.

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

M	intern/cycles/blender/blender_session.cpp

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

diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index e34bd9b..07dae48 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -416,7 +416,7 @@ void BlenderSession::render()
 	/* render each layer */
 	BL::RenderSettings r = b_scene.render();
 	BL::RenderSettings::layers_iterator b_layer_iter;
-	BL::RenderSettings::views_iterator b_view_iter;
+	BL::RenderResult::views_iterator b_view_iter;
 	
 	for(r.layers.begin(b_layer_iter); b_layer_iter != r.layers.end(); ++b_layer_iter) {
 		b_rlay_name = b_layer_iter->name();
@@ -463,7 +463,7 @@ void BlenderSession::render()
 		scene->film->tag_update(scene);
 		scene->integrator->tag_update(scene);
 
-		for(r.views.begin(b_view_iter); b_view_iter != r.views.end(); ++b_view_iter) {
+		for(b_rr.views.begin(b_view_iter); b_view_iter != b_rr.views.end(); ++b_view_iter) {
 			b_rview_name = b_view_iter->name();
 
 			/* set the current view */