mirror of
https://github.com/ynput/ayon-core.git
synced 2026-01-02 00:44:52 +01:00
moved family definition from extractor to collector
This commit is contained in:
parent
0bfe5b6e61
commit
df4ecca987
2 changed files with 8 additions and 11 deletions
|
|
@ -24,7 +24,8 @@ class CollectInstances(pyblish.api.ContextPlugin):
|
||||||
# Global instance data modifications
|
# Global instance data modifications
|
||||||
# Fill families
|
# Fill families
|
||||||
family = instance_data["family"]
|
family = instance_data["family"]
|
||||||
instance_data["families"] = [family]
|
# Add `review` family for thumbnail integration
|
||||||
|
instance_data["families"] = [family, "review"]
|
||||||
|
|
||||||
# Instance name
|
# Instance name
|
||||||
subset_name = instance_data["subset"]
|
subset_name = instance_data["subset"]
|
||||||
|
|
@ -42,6 +43,8 @@ class CollectInstances(pyblish.api.ContextPlugin):
|
||||||
if family == "review":
|
if family == "review":
|
||||||
instance = context.create_instance(**instance_data)
|
instance = context.create_instance(**instance_data)
|
||||||
instance.data["layers"] = context.data["layersData"]
|
instance.data["layers"] = context.data["layersData"]
|
||||||
|
# Add ftrack family
|
||||||
|
instance.data["families"].append("ftrack")
|
||||||
|
|
||||||
elif family == "renderLayer":
|
elif family == "renderLayer":
|
||||||
instance = self.create_render_layer_instance(
|
instance = self.create_render_layer_instance(
|
||||||
|
|
@ -90,6 +93,10 @@ class CollectInstances(pyblish.api.ContextPlugin):
|
||||||
return None
|
return None
|
||||||
|
|
||||||
instance_data["layers"] = group_layers
|
instance_data["layers"] = group_layers
|
||||||
|
|
||||||
|
# Add ftrack family
|
||||||
|
instance_data["families"].append("ftrack")
|
||||||
|
|
||||||
return context.create_instance(**instance_data)
|
return context.create_instance(**instance_data)
|
||||||
|
|
||||||
def create_render_pass_instance(self, context, instance_data):
|
def create_render_pass_instance(self, context, instance_data):
|
||||||
|
|
|
||||||
|
|
@ -133,19 +133,9 @@ class ExtractSequence(pyblish.api.Extractor):
|
||||||
|
|
||||||
# Fill tags and new families
|
# Fill tags and new families
|
||||||
tags = []
|
tags = []
|
||||||
new_families = ["review"]
|
|
||||||
if family_lowered in ("review", "renderlayer"):
|
if family_lowered in ("review", "renderlayer"):
|
||||||
# QUESTION Thould this be set here or in collector?
|
|
||||||
# Add ftrack family
|
|
||||||
new_families.append("ftrack")
|
|
||||||
# Add `ftrackreview` tag
|
# Add `ftrackreview` tag
|
||||||
tags.append("ftrackreview")
|
tags.append("ftrackreview")
|
||||||
# QUESTION we still use this?
|
|
||||||
instance.data["review"] = True
|
|
||||||
|
|
||||||
for new_family in new_families:
|
|
||||||
if new_family not in instance.data["families"]:
|
|
||||||
instance.data["families"].append(new_family)
|
|
||||||
|
|
||||||
repre_files = [
|
repre_files = [
|
||||||
os.path.basename(filepath)
|
os.path.basename(filepath)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue