From 6e9853739a2dab54eb26bb8c5b488e83e1d84f26 Mon Sep 17 00:00:00 2001 From: Toke Jepsen Date: Thu, 13 Jun 2019 15:43:56 +0100 Subject: [PATCH 1/2] Switch look to new integrator and add representations. --- pype/plugins/global/publish/integrate.py | 3 +-- pype/plugins/global/publish/integrate_new.py | 3 ++- pype/plugins/maya/publish/extract_look.py | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/pype/plugins/global/publish/integrate.py b/pype/plugins/global/publish/integrate.py index 208bc027d5..29a4ba3c17 100644 --- a/pype/plugins/global/publish/integrate.py +++ b/pype/plugins/global/publish/integrate.py @@ -25,8 +25,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin): label = "Integrate Asset" order = pyblish.api.IntegratorOrder - families = ["look", - "assembly", + families = ["assembly", "yetiRig", "yeticache"] exclude_families = ["clip"] diff --git a/pype/plugins/global/publish/integrate_new.py b/pype/plugins/global/publish/integrate_new.py index 803ecdd7cc..25ab519c8c 100644 --- a/pype/plugins/global/publish/integrate_new.py +++ b/pype/plugins/global/publish/integrate_new.py @@ -61,7 +61,8 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin): "render", "write", "rig", - "plate" + "plate", + "look" ] exclude_families = ["clip"] diff --git a/pype/plugins/maya/publish/extract_look.py b/pype/plugins/maya/publish/extract_look.py index a9bff39066..5b4d7bc49b 100644 --- a/pype/plugins/maya/publish/extract_look.py +++ b/pype/plugins/maya/publish/extract_look.py @@ -281,6 +281,24 @@ class ExtractLook(pype.api.Extractor): instance.data["files"].append(maya_fname) instance.data["files"].append(json_fname) + instance.data["representations"] = [] + instance.data["representations"].append( + { + "name": "ma", + "ext": '.ma', + "files": os.path.basename(maya_fname), + "stagingDir": os.path.dirname(maya_fname), + } + ) + instance.data["representations"].append( + { + "name": "json", + "ext": '.json', + "files": os.path.basename(json_fname), + "stagingDir": os.path.dirname(json_fname), + } + ) + # Set up the resources transfers/links for the integrator instance.data["transfers"].extend(transfers) instance.data["hardlinks"].extend(hardlinks) From 7da07b4b20074d2762c60e559cfa4da428e63195 Mon Sep 17 00:00:00 2001 From: Toke Jepsen Date: Fri, 14 Jun 2019 08:16:20 +0100 Subject: [PATCH 2/2] Remove dots from extension. --- pype/plugins/maya/publish/extract_look.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pype/plugins/maya/publish/extract_look.py b/pype/plugins/maya/publish/extract_look.py index 5b4d7bc49b..463547f78c 100644 --- a/pype/plugins/maya/publish/extract_look.py +++ b/pype/plugins/maya/publish/extract_look.py @@ -285,7 +285,7 @@ class ExtractLook(pype.api.Extractor): instance.data["representations"].append( { "name": "ma", - "ext": '.ma', + "ext": 'ma', "files": os.path.basename(maya_fname), "stagingDir": os.path.dirname(maya_fname), } @@ -293,7 +293,7 @@ class ExtractLook(pype.api.Extractor): instance.data["representations"].append( { "name": "json", - "ext": '.json', + "ext": 'json', "files": os.path.basename(json_fname), "stagingDir": os.path.dirname(json_fname), }