Merge branch 'master' into feature/121/vr

components/renderers/cpp/src/splat_render.cpp

@@ -472,7 +472,7 @@ bool Splatter::render(ftl::rgbd::VirtualSource *src, ftl::rgbd::Frame &out) {
 		out.get<GpuMat>(Channel::Right).setTo(background_, cvstream);
 
 		_dibr(stream_); // Need to re-dibr due to pose change
-		_renderChannel(out, Channel::Right, Channel::Right, stream_);
+		_renderChannel(out, Channel::Left, Channel::Right, stream_);
 		
 		// renderFrame() expects to render right frame from left as well; Should
 		// possibly add channel_in and channel_out parameters to renderFrame()?
@@ -484,6 +484,7 @@ bool Splatter::render(ftl::rgbd::VirtualSource *src, ftl::rgbd::Frame &out) {
 		swap(tmp, out.get<GpuMat>(Channel::Right));
 		*/
 
+		_renderChannel(out, Channel::Left, Channel::Right, stream_);
 	} else if (chan != Channel::None) {
 		if (ftl::codecs::isFloatChannel(chan)) {
 			out.create<GpuMat>(chan, Format<float>(camera.width, camera.height));