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

Merge branch 'develop' into chore/extract_color_transcode_remove_duplicate_function

Browse source
This commit is contained in:
Jakub Trllo 2024-06-11 11:08:18 +02:00 • committed by GitHub
commit c17f53d89d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/ayon_core/plugins/publish/collect_anatomy_instance_data.py
View file

@ -313,7 +313,14 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
# Define version
version_number = None
if self.follow_workfile_version:
# Allow an instance to force enable or disable the version
# following of the current context
use_context_version = self.follow_workfile_version
if "followWorkfileVersion" in instance.data:
use_context_version = instance.data["followWorkfileVersion"]
if use_context_version:
version_number = context.data("version")
# Even if 'follow_workfile_version' is enabled, it may not be set

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

@ -28,7 +28,8 @@ class CollectSceneVersion(pyblish.api.ContextPlugin):
"photoshop",
"resolve",
"tvpaint",
"motionbuilder"
"motionbuilder",
"substancepainter"
]
# in some cases of headless publishing (for example webpublisher using PS)

6
client/ayon_core/plugins/publish/extract_color_transcode.py
View file

@ -202,10 +202,10 @@ class ExtractOIIOTranscode(publish.Extractor):
added_representations = True
if added_representations:
self._mark_original_repre_for_deletion(repre, profile,
added_review)
self._mark_original_repre_for_deletion(
repre, profile, added_review
)
for repre in tuple(instance.data["representations"]):
tags = repre.get("tags") or []
if "delete" in tags and "thumbnail" not in tags:
instance.data["representations"].remove(repre)

4
server/settings/publish_plugins.py
View file

@ -863,7 +863,8 @@ DEFAULT_PUBLISH_VALUES = {
"nuke",
"photoshop",
"resolve",
"tvpaint"
"tvpaint",
"substancepainter"
],
"skip_hosts_headless_publish": []
},
@ -890,6 +891,7 @@ DEFAULT_PUBLISH_VALUES = {
"maya",
"nuke",
"photoshop",
"substancepainter"
],
"enabled": True,
"optional": False,