Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 16:34:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'hotfix/psd_workfile_publishing_versions'

Browse source
This commit is contained in:
Milan Kolar 2020-09-15 17:58:50 +02:00
commit a83434aa4b
3 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pype/plugins/global/publish/validate_version.py
View file

@ -10,7 +10,7 @@ class ValidateVersion(pyblish.api.InstancePlugin):
order = pyblish.api.ValidatorOrder order = pyblish.api.ValidatorOrder
label = "Validate Version" label = "Validate Version"
hosts = ["nuke", "maya", "blender"] hosts = ["nuke", "maya", "blender", "standalonepublisher"]
def process(self, instance): def process(self, instance):
version = instance.data.get("version") version = instance.data.get("version")

2
pype/plugins/standalonepublisher/publish/collect_context.py
View file

@ -123,7 +123,7 @@ class CollectContextDataSAPublish(pyblish.api.ContextPlugin):
"label": subset, "label": subset,
"name": subset, "name": subset,
"family": in_data["family"], "family": in_data["family"],
"version": in_data.get("version", 1), # "version": in_data.get("version", 1),
"frameStart": in_data.get("representations", [None])[0].get( "frameStart": in_data.get("representations", [None])[0].get(
"frameStart", None "frameStart", None
), ),

14
pype/plugins/standalonepublisher/publish/collect_psd_instances.py
View file

@ -9,7 +9,7 @@ class CollectPsdInstances(pyblish.api.InstancePlugin):
""" """
label = "Collect Psd Instances" label = "Collect Psd Instances"
order = pyblish.api.CollectorOrder + 0.492 order = pyblish.api.CollectorOrder + 0.489
hosts = ["standalonepublisher"] hosts = ["standalonepublisher"]
families = ["background_batch"] families = ["background_batch"]
@ -34,8 +34,6 @@ class CollectPsdInstances(pyblish.api.InstancePlugin):
context = instance.context context = instance.context
asset_data = instance.data["assetEntity"] asset_data = instance.data["assetEntity"]
asset_name = instance.data["asset"] asset_name = instance.data["asset"]
anatomy_data = instance.data["anatomyData"]
for subset_name, subset_data in self.subsets.items(): for subset_name, subset_data in self.subsets.items():
instance_name = f"{asset_name}_{subset_name}" instance_name = f"{asset_name}_{subset_name}"
task = subset_data.get("task", "background") task = subset_data.get("task", "background")
@ -55,16 +53,8 @@ class CollectPsdInstances(pyblish.api.InstancePlugin):
new_instance.data["label"] = f"{instance_name}" new_instance.data["label"] = f"{instance_name}"
new_instance.data["subset"] = subset_name new_instance.data["subset"] = subset_name
new_instance.data["task"] = task
# fix anatomy data
anatomy_data_new = copy.deepcopy(anatomy_data)
# updating hierarchy data
anatomy_data_new.update({
"asset": asset_data["name"],
"task": task,
"subset": subset_name
})
new_instance.data["anatomyData"] = anatomy_data_new
if subset_name in self.unchecked_by_default: if subset_name in self.unchecked_by_default:
new_instance.data["publish"] = False new_instance.data["publish"] = False