Bundle missing merge-exr.blend, required for progressive rendering

CHANGELOG.md

@@ -6,6 +6,7 @@ changed functionality, fixed bugs).
 ## Version 2.1.1 (in development)
 
 - Always log the version of Flamenco Manager.
+- Include missing merge-exr.blend, required for progressive rendering, in the distribution bundle.
 
 
 ## Version 2.1.0 (2018-01-04)

flamenco-worker.spec

@@ -13,7 +13,8 @@ a = Analysis(['flamenco-worker.py'],
              datas=[('flamenco-worker.cfg', '.'),
                     ('README.md', '.'),
                     ('CHANGELOG.md', '.'),
-                    ('LICENSE.txt', '.')],
+                    ('LICENSE.txt', '.'),
+                    ('flamenco_worker/merge-exr.blend', 'flamenco_worker')],
              hiddenimports=[],
              hookspath=[],
              runtime_hooks=[],

setup.py

@@ -56,6 +56,7 @@ class ZipCommand(Command):
             add_to_root(Path('LICENSE.txt'))
             add_to_root(Path('README.md'))
             add_to_root(Path('CHANGELOG.md'))
+            add_to_root(Path('flamenco_worker/merge-exr.blend'))
 
             paths = collections.deque([Path('system-integration')])
             while paths: