[Bf-blender-cvs] [6df28be] multiview: From review: fix Cycles tiles udpate not working *

Dalai Felinto noreply at git.blender.org
Fri Mar 20 01:51:17 CET 2015


Commit: 6df28be1f7c37fd3b1ed424048a04a3b9c9dc7e5
Author: Dalai Felinto
Date:   Fri Mar 20 01:46:54 2015 +0100
Branches: multiview
https://developer.blender.org/rB6df28be1f7c37fd3b1ed424048a04a3b9c9dc7e5

>From review: fix Cycles tiles udpate not working *

* note: I tried passing b_combined_pass to the do_write_update_render_result() function
but b_rlay is created in do_write_update_render_tile, thus it's not the same that we have on run().

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

M	intern/cycles/blender/blender_session.cpp

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

diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index 07dae48..4f4f11c 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -630,6 +630,12 @@ void BlenderSession::do_write_update_render_result(BL::RenderResult b_rr, BL::Re
 			b_pass.rect(&pixels[0]);
 		}
 	}
+	else {
+		/* copy combined pass */
+		 BL::RenderPass b_combined_pass(b_rlay.passes.find_by_type(BL::RenderPass::type_COMBINED, b_rview_name.c_str()));
+		if(buffers->get_pass_rect(PASS_COMBINED, exposure, rtile.sample, 4, &pixels[0]))
+			b_combined_pass.rect(&pixels[0]);
+	}
 
 	/* tag result as updated */
 	b_engine.update_result(b_rr);




More information about the Bf-blender-cvs mailing list