From 93df21864c42db03805e0c2e18ab12a48e958a30 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Mon, 17 Dec 2018 18:29:01 +0100 Subject: [PATCH] add arnold environments --- pype/plugins/ftrack/collect_ftrack_api.py | 2 +- pype/plugins/ftrack/integrate_ftrack_api.py | 2 ++ pype/plugins/ftrack/integrate_ftrack_instances.py | 13 ++++++------- pype/plugins/maya/publish/collect_current_file.py | 1 + pype/plugins/maya/publish/submit_deadline.py | 7 +++++++ 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/pype/plugins/ftrack/collect_ftrack_api.py b/pype/plugins/ftrack/collect_ftrack_api.py index 155db6fed8..7afa4d50a0 100644 --- a/pype/plugins/ftrack/collect_ftrack_api.py +++ b/pype/plugins/ftrack/collect_ftrack_api.py @@ -25,6 +25,6 @@ class CollectFtrackApi(pyblish.api.ContextPlugin): result = session.query('Task where\ project.full_name is "{0}" and\ name is "{1}" and\ - parent.name is "{2}"'.format(project, task, asset)) + parent.name is "{2}"'.format(project, task, asset)).one() context.data["ftrackTask"] = result diff --git a/pype/plugins/ftrack/integrate_ftrack_api.py b/pype/plugins/ftrack/integrate_ftrack_api.py index 279dfb9b54..93ee7d627e 100644 --- a/pype/plugins/ftrack/integrate_ftrack_api.py +++ b/pype/plugins/ftrack/integrate_ftrack_api.py @@ -82,6 +82,8 @@ class IntegrateFtrackApi(pyblish.api.InstancePlugin): self.query("Asset", asset_data) ).first() + self.log.info(asset_entity) + # Extracting metadata, and adding after entity creation. This is # due to a ftrack_api bug where you can't add metadata on creation. asset_metadata = asset_data.pop("metadata", {}) diff --git a/pype/plugins/ftrack/integrate_ftrack_instances.py b/pype/plugins/ftrack/integrate_ftrack_instances.py index 37976ea933..5f6bc8d236 100644 --- a/pype/plugins/ftrack/integrate_ftrack_instances.py +++ b/pype/plugins/ftrack/integrate_ftrack_instances.py @@ -45,7 +45,6 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin): ft_session = instance.context.data["ftrackSession"] - for file in instance.data['destination_list']: self.log.debug('file {}'.format(file)) @@ -56,21 +55,21 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin): if ext in ['.mov']: location = ft_session.query( - 'Location where name is "ftrack.server"').one() + 'Location where name is "ftrack.server"').one() component_data = { "name": "ftrackreview-mp4", # Default component name is "main". "metadata": {'ftr_meta': json.dumps({ - 'frameIn': int(instance.data["startFrame"]), - 'frameOut': int(instance.data["startFrame"]), - 'frameRate': 25})} - } + 'frameIn': int(instance.data["startFrame"]), + 'frameOut': int(instance.data["startFrame"]), + 'frameRate': 25})} + } elif ext in [".jpg"]: component_data = { "name": "thumbnail" # Default component name is "main". } thumbnail = True location = ft_session.query( - 'Location where name is "ftrack.server"').one() + 'Location where name is "ftrack.server"').one() else: component_data = { "name": ext[1:] # Default component name is "main". diff --git a/pype/plugins/maya/publish/collect_current_file.py b/pype/plugins/maya/publish/collect_current_file.py index 0886d02340..bd8590a472 100644 --- a/pype/plugins/maya/publish/collect_current_file.py +++ b/pype/plugins/maya/publish/collect_current_file.py @@ -46,3 +46,4 @@ class CollectMayaCurrentFile(pyblish.api.ContextPlugin): self.log.info('Collected instance: {}'.format(file)) self.log.info('Scene path: {}'.format(current_file)) self.log.info('stagin Dir: {}'.format(folder)) + self.log.info('subset: {}'.format(filename)) diff --git a/pype/plugins/maya/publish/submit_deadline.py b/pype/plugins/maya/publish/submit_deadline.py index 97a593e45b..2321cad96f 100644 --- a/pype/plugins/maya/publish/submit_deadline.py +++ b/pype/plugins/maya/publish/submit_deadline.py @@ -229,6 +229,13 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin): # running Linux and the submitter is on Windows. "PYTHONPATH", + "MTOA_EXTENSIONS_PATH", + "MTOA_EXTENSIONS", + "DYLD_LIBRARY_PATH", + "MAYA_RENDER_DESC_PATH", + "MAYA_MODULE_PATH", + "ARNOLD_PLUGIN_PATH", + # todo: This is a temporary fix for yeti variables "PEREGRINEL_LICENSE", "REDSHIFT_MAYAEXTENSIONSPATH",