From 5026dfc441ecf4be7678597a1d57077063009974 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Tue, 7 Mar 2017 11:00:23 +0100
Subject: [PATCH] Fixed sample count when using branched path tracing

Thanks to dr. Sharybin for the patch.
---
 blender_cloud/flamenco/__init__.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/blender_cloud/flamenco/__init__.py b/blender_cloud/flamenco/__init__.py
index d6b2f92..5320204 100644
--- a/blender_cloud/flamenco/__init__.py
+++ b/blender_cloud/flamenco/__init__.py
@@ -162,7 +162,11 @@ class FLAMENCO_OT_render(async_loop.AsyncModalOperatorMixin,
 
         # Add extra settings specific to the job type
         if scene.flamenco_render_job_type == 'blender-render-progressive':
-            samples = scene.cycles.samples
+            if scene.cycles.progressive == 'BRANCHED_PATH':
+                samples = scene.cycles.aa_samples
+            else:
+                samples = scene.cycles.samples
+
             if scene.cycles.use_square_samples:
                 samples **= 2