diff --git a/CHANGELOG.md b/CHANGELOG.md index a69f94cacb521ffa1c82de0f6e4c681acd200351..12df397928f46318539fce306c9d3b33b02b8414 100644 --- a/CHANGELOG.md +++ b/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) diff --git a/flamenco-worker.spec b/flamenco-worker.spec index 3a097704d79d10ac8185b0be94ddb93e27b32157..69ff31ae1ce88fc4e07830631451fe36bee1bf1f 100644 --- a/flamenco-worker.spec +++ b/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=[], diff --git a/setup.py b/setup.py index cb59a0cac08acbf4466ca914f43075fda596ad86..93a51e814bce23efac12969cf11c779f4f68505d 100755 --- a/setup.py +++ b/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: