Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-26 05:42:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename 'subsetGroup' > 'productGroup'

Browse source
This commit is contained in:
Jakub Trllo 2024-03-05 14:09:34 +01:00
parent 3ba6edc483
commit 805c199614
5 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/ayon_core/hosts/houdini/plugins/publish/collect_instances_usd_layered.py
View file

@ -89,7 +89,7 @@ class CollectInstancesUsdLayered(pyblish.api.ContextPlugin):
# For now group ALL of them into USD Layer product group
# Allow this product to be grouped into a USD Layer on creation
data["subsetGroup"] = "USD Layer"
data["productGroup"] = "USD Layer"
instances = list()
dependencies = []

2
client/ayon_core/hosts/houdini/plugins/publish/collect_usd_layers.py
View file

@ -64,4 +64,4 @@ class CollectUsdLayers(pyblish.api.InstancePlugin):
layer_inst.append((layer, save_path))
# Allow this product to be grouped into a USD Layer on creation
layer_inst.data["subsetGroup"] = "USD Layer"
layer_inst.data["productGroup"] = "USD Layer"

2
client/ayon_core/hosts/substancepainter/plugins/publish/collect_textureset_images.py
View file

@ -132,7 +132,7 @@ class CollectTextureSet(pyblish.api.InstancePlugin):
image_instance.data["representations"] = [representation]
# Group the textures together in the loader
image_instance.data["subsetGroup"] = image_product_name
image_instance.data["productGroup"] = image_product_name
# Store the texture set name and stack name on the instance
image_instance.data["textureSetName"] = texture_set_name

10
client/ayon_core/plugins/publish/integrate.py
View file

@ -428,14 +428,14 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
"families": get_instance_families(instance)
}
subset_group = instance.data.get("subsetGroup")
subset_group = instance.data.get("productGroup")
if subset_group:
data["subsetGroup"] = subset_group
data["productGroup"] = subset_group
elif existing_subset_doc:
# Preserve previous subset group if new version does not set it
if "subsetGroup" in existing_subset_doc.get("data", {}):
subset_group = existing_subset_doc["data"]["subsetGroup"]
data["subsetGroup"] = subset_group
if "productGroup" in existing_subset_doc.get("data", {}):
subset_group = existing_subset_doc["data"]["productGroup"]
data["productGroup"] = subset_group
subset_id = None
if existing_subset_doc:

16
client/ayon_core/plugins/publish/integrate_product_group.py
View file

@ -1,10 +1,10 @@
"""Produces instance.data["subsetGroup"] data used during integration.
"""Produces instance.data["productGroup"] data used during integration.
Requires:
dict -> context["anatomyData"] *(pyblish.api.CollectorOrder + 0.49)
Provides:
instance -> subsetGroup (str)
instance -> productGroup (str)
"""
import pyblish.api
@ -18,7 +18,7 @@ from ayon_core.lib import (
class IntegrateProductGroup(pyblish.api.InstancePlugin):
"""Integrate Subset Group for publish."""
"""Integrate Product Group for publish."""
# Run after CollectAnatomyInstanceData
order = pyblish.api.IntegratorOrder - 0.1
@ -37,11 +37,11 @@ class IntegrateProductGroup(pyblish.api.InstancePlugin):
if not self.product_grouping_profiles:
return
if instance.data.get("subsetGroup"):
# If subsetGroup is already set then allow that value to remain
if instance.data.get("productGroup"):
# If productGroup is already set then allow that value to remain
self.log.debug((
"Skipping collect product group due to existing value: {}"
).format(instance.data["subsetGroup"]))
).format(instance.data["productGroup"]))
return
# Skip if there is no matching profile
@ -79,11 +79,11 @@ class IntegrateProductGroup(pyblish.api.InstancePlugin):
except (KeyError, TemplateUnsolved):
keys = fill_pairs.keys()
self.log.warning((
"Subset grouping failed. Only {} are expected in Settings"
"Product grouping failed. Only {} are expected in Settings"
).format(','.join(keys)))
if filled_template:
instance.data["subsetGroup"] = filled_template
instance.data["productGroup"] = filled_template
def get_profile_filter_criteria(self, instance):
"""Return filter criteria for `filter_profiles`"""