Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve conflict

Browse source
This commit is contained in:
Kayla Man 2024-06-10 21:30:34 +08:00
commit bb57e76cb4
9 changed files with 49 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/ayon_core/cli_commands.py
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

1
client/ayon_core/plugins/publish/collect_scene_version.py
View file

@ -28,6 +28,7 @@ class CollectSceneVersion(pyblish.api.ContextPlugin):
"photoshop",
"resolve",
"tvpaint",
"motionbuilder",
"substancepainter"
]

BIN
client/ayon_core/resources/app_icons/motionbuilder.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 35 KiB

2
server_addon/applications/client/ayon_applications/version.py
View file

@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
"""Package declaring AYON addon 'applications' version."""
__version__ = "0.2.3"
__version__ = "0.2.4"

2
server_addon/applications/package.py
View file

@ -1,6 +1,6 @@
name = "applications"
title = "Applications"
version = "0.2.3"
version = "0.2.4"
client_dir = "ayon_applications"

35
server_addon/applications/server/applications.json
View file

@ -1293,6 +1293,41 @@
}
]
},
"motionbuilder": {
"enabled": true,
"label": "Motion Builder",
"icon": "{}/app_icons/motionbuilder.png",
"host_name": "motionbuilder",
"environment": "{}",
"variants": [
{
"name": "2025",
"label": "2025",
"use_python_2": false,
"executables": {
"windows": [
"C:\\Program Files\\Autodesk\\MotionBuilder 2025\\bin\\x64\\motionbuilder.exe"
],
"darwin": [],
"linux": []
},
"environment": "{}"
},
{
"name": "2024",
"label": "2024",
"use_python_2": false,
"executables": {
"windows": [
"C:\\Program Files\\Autodesk\\MotionBuilder 2024\\bin\\x64\\motionbuilder.exe"
],
"darwin": [],
"linux": []
},
"environment": "{}"
}
]
},
"additional_apps": []
}
}

2
server_addon/applications/server/settings.py
View file

@ -192,6 +192,8 @@ class ApplicationsSettings(BaseSettingsModel):
default_factory=AppGroupWithPython, title="Zbrush")
equalizer: AppGroup = SettingsField(
default_factory=AppGroupWithPython, title="3DEqualizer")
motionbuilder: AppGroup = SettingsField(
default_factory=AppGroupWithPython, title="Motion Builder")
additional_apps: list[AdditionalAppGroup] = SettingsField(
default_factory=list, title="Additional Applications")

5
server_addon/substancepainter/client/ayon_substancepainter/plugins/create/create_textures.py
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,

4
server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/collect_textureset_images.py
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