From 5c819475c6edc6c18d32d032b806b1f760b9e03f Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Thu, 18 Jul 2019 14:29:27 +0200 Subject: [PATCH] fix allwo burnin without explicit verson --- pype/plugins/global/publish/collect_filesequences.py | 5 +---- pype/plugins/global/publish/extract_burnin.py | 7 ++++++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pype/plugins/global/publish/collect_filesequences.py b/pype/plugins/global/publish/collect_filesequences.py index 5c3914aa41..ed48404a98 100644 --- a/pype/plugins/global/publish/collect_filesequences.py +++ b/pype/plugins/global/publish/collect_filesequences.py @@ -130,8 +130,6 @@ class CollectRenderedFrames(pyblish.api.ContextPlugin): api.Session.update(session) os.environ.update(session) - version = data.get("version") - context.data['version'] = version else: # Search in directory data = dict() @@ -196,8 +194,7 @@ class CollectRenderedFrames(pyblish.api.ContextPlugin): "startFrame": start, "endFrame": end, "fps": fps, - "source": data.get('source', ''), - "version": version + "source": data.get('source', '') }) instance.append(collection) instance.context.data['fps'] = fps diff --git a/pype/plugins/global/publish/extract_burnin.py b/pype/plugins/global/publish/extract_burnin.py index 2e9e61ad82..721b7e75f8 100644 --- a/pype/plugins/global/publish/extract_burnin.py +++ b/pype/plugins/global/publish/extract_burnin.py @@ -24,13 +24,18 @@ class ExtractBurnin(pype.api.Extractor): raise RuntimeError("Burnin needs already created mov to work on.") # TODO: expand burnin data list to include all usefull keys + version = '' + if instance.context.data.get('version'): + version = "v" + str(instance.context.data['version']) + burnin_data = { "username": instance.context.data['user'], "asset": os.environ['AVALON_ASSET'], "task": os.environ['AVALON_TASK'], "start_frame": int(instance.data['startFrame']), - "version": "v" + str(instance.context.data['version']) + "version": version } + self.log.debug("__ burnin_data1: {}".format(burnin_data)) for i, repre in enumerate(instance.data["representations"]): self.log.debug("__ i: `{}`, repre: `{}`".format(i, repre))