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

Merge branch 'develop' into bugfix/oiio-transcode-delete-in-repre

Browse source
This commit is contained in:
Jakub Trllo 2024-06-11 10:54:59 +02:00 • committed by GitHub
commit 239dd103c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 24 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/ayon_core/lib/attribute_definitions.py
View file

@ -281,7 +281,7 @@ class HiddenDef(AbstractAttrDef):
def __init__(self, key, default=None, **kwargs):
kwargs["default"] = default
kwargs["hidden"] = True
super(UnknownDef, self).__init__(key, **kwargs)
super(HiddenDef, self).__init__(key, **kwargs)
def convert_value(self, value):
return value

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

@ -364,7 +364,7 @@ class ExtractOIIOTranscode(publish.Extractor):
if not repre.get("colorspaceData"):
self.log.debug("Representation '{}' has no colorspace data. "
"Skipped.")
"Skipped.".format(repre["name"]))
return False
return True

4
client/ayon_core/tools/launcher/ui/hierarchy_page.py
View file

@ -70,7 +70,7 @@ class HierarchyPage(QtWidgets.QWidget):
main_layout.addWidget(content_body, 1)
btn_back.clicked.connect(self._on_back_clicked)
refresh_btn.clicked.connect(self._on_refreh_clicked)
refresh_btn.clicked.connect(self._on_refresh_clicked)
folders_filter_text.textChanged.connect(self._on_filter_text_changed)
self._is_visible = False
@ -99,7 +99,7 @@ class HierarchyPage(QtWidgets.QWidget):
def _on_back_clicked(self):
self._controller.set_selected_project(None)
def _on_refreh_clicked(self):
def _on_refresh_clicked(self):
self._controller.refresh()
def _on_filter_text_changed(self, text):

10
server_addon/deadline/client/ayon_deadline/lib.py Normal file
View file

@ -0,0 +1,10 @@
# describes list of product typed used for plugin filtering for farm publishing
FARM_FAMILIES = [
"render", "render.farm", "render.frames_farm",
"prerender", "prerender.farm", "prerender.frames_farm",
"renderlayer", "imagesequence", "image",
"vrayscene", "maxrender",
"arnold_rop", "mantra_rop",
"karma_rop", "vray_rop", "redshift_rop",
"renderFarm", "usrender", "publish.hou"
]

18
server_addon/deadline/client/ayon_deadline/plugins/publish/collect_deadline_server_from_instance.py
View file

@ -8,6 +8,8 @@ attribute or using default server if that attribute doesn't exists.
import pyblish.api
from ayon_core.pipeline.publish import KnownPublishError
from ayon_deadline.lib import FARM_FAMILIES
class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
"""Collect Deadline Webservice URL from instance."""
@ -16,20 +18,8 @@ class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
order = pyblish.api.CollectorOrder + 0.225
label = "Deadline Webservice from the Instance"
targets = ["local"]
families = ["render",
"rendering",
"render.farm",
"renderFarm",
"renderlayer",
"maxrender",
"usdrender",
"redshift_rop",
"arnold_rop",
"mantra_rop",
"karma_rop",
"vray_rop",
"publish.hou",
"image"] # for Fusion
families = FARM_FAMILIES
def process(self, instance):
if not instance.data.get("farm"):

19
server_addon/deadline/client/ayon_deadline/plugins/publish/collect_pools.py
View file

@ -3,6 +3,8 @@ import pyblish.api
from ayon_core.lib import TextDef
from ayon_core.pipeline.publish import AYONPyblishPluginMixin
from ayon_deadline.lib import FARM_FAMILIES
class CollectDeadlinePools(pyblish.api.InstancePlugin,
AYONPyblishPluginMixin):
@ -36,22 +38,7 @@ class CollectDeadlinePools(pyblish.api.InstancePlugin,
"nuke",
]
families = [
"render",
"prerender",
"rendering",
"render.farm",
"renderFarm",
"renderlayer",
"maxrender",
"usdrender",
"redshift_rop",
"arnold_rop",
"mantra_rop",
"karma_rop",
"vray_rop",
"publish.hou",
]
families = FARM_FAMILIES
primary_pool = None
secondary_pool = None

16
server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py
View file

@ -14,6 +14,8 @@ import pyblish.api
from ayon_api import get_server_api_connection
from ayon_deadline.lib import FARM_FAMILIES
class CollectDeadlineUserCredentials(pyblish.api.InstancePlugin):
"""Collects user name and password for artist if DL requires authentication
@ -31,19 +33,7 @@ class CollectDeadlineUserCredentials(pyblish.api.InstancePlugin):
"max",
"houdini"]
families = ["render",
"rendering",
"render.farm",
"renderFarm",
"renderlayer",
"maxrender",
"usdrender",
"redshift_rop",
"arnold_rop",
"mantra_rop",
"karma_rop",
"vray_rop",
"publish.hou"]
families = FARM_FAMILIES
def process(self, instance):
if not instance.data.get("farm"):