Merge branch 'develop' into feature/AY-5372_-Feature-integrationunit-tests

This commit is contained in:
Jakub Trllo 2024-06-10 14:58:31 +02:00 committed by GitHub
commit c0be1b79c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 2 deletions

View file

@ -36,7 +36,7 @@ class Commands:
log.warning(
"Failed to add cli command for module \"{}\"".format(
addon.name
)
), exc_info=True
)
return click_func

View file

@ -46,6 +46,7 @@ class CreateTextures(Creator):
creator_attributes = instance_data.setdefault(
"creator_attributes", dict())
for key in [
"review",
"exportPresetUrl",
"exportFileFormat",
"exportSize",
@ -143,6 +144,10 @@ class CreateTextures(Creator):
}
return [
BoolDef("review",
label="Review",
tooltip="Mark as reviewable",
default=True),
EnumDef("exportChannel",
items=export_channel_enum,
multiselection=True,

View file

@ -124,7 +124,6 @@ class CollectTextureSet(pyblish.api.InstancePlugin):
staging_dir = os.path.dirname(first_filepath)
representation["tags"] = ["review"]
representation["stagingDir"] = staging_dir
# Clone the instance
product_type = "image"
image_instance = context.create_instance(image_product_name)
@ -136,6 +135,9 @@ class CollectTextureSet(pyblish.api.InstancePlugin):
image_instance.data["productType"] = product_type
image_instance.data["family"] = product_type
image_instance.data["families"] = [product_type, "textures"]
if instance.data["creator_attributes"].get("review"):
image_instance.data["families"].append("review")
image_instance.data["representations"] = [representation]
# Group the textures together in the loader