Merge branch 'master' into blender2.8

1 files changed, 13 insertions, 1 deletions

diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index f010e24cbe4..1c1ca43b56a 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -386,7 +386,10 @@ void BlenderSession::render()
 	BL::RenderSettings r = b_scene.render();
 	BL::RenderSettings::layers_iterator b_layer_iter;
 	BL::RenderResult::views_iterator b_view_iter;
-	
+
+	/* We do some special meta attributes when we only have single layer. */
+	const bool is_single_layer = (r.layers.length() == 1);
+
 	for(r.layers.begin(b_layer_iter); b_layer_iter != r.layers.end(); ++b_layer_iter) {
 		b_rlay_name = b_layer_iter->name();
 
@@ -481,6 +484,15 @@ void BlenderSession::render()
 				break;
 		}
 
+		if(is_single_layer) {
+			BL::RenderResult b_rr = b_engine.get_result();
+			string num_aa_samples = string_printf("%d", session->params.samples);
+			b_rr.stamp_data_add_field("Cycles Samples", num_aa_samples.c_str());
+			/* TODO(sergey): Report whether we're doing resumable render
+			 * and also start/end sample if so.
+			 */
+		}
+
 		/* free result without merging */
 		end_render_result(b_engine, b_rr, true, true, false);