mirror of
https://github.com/ynput/ayon-core.git
synced 2026-01-01 16:34:53 +01:00
Merge branch 'develop' into enhancement/1562-version-locking-does-not-work-nuke-maya-tested
This commit is contained in:
commit
b25e3e27ad
8 changed files with 35 additions and 6 deletions
1
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
1
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
|
|
@ -35,6 +35,7 @@ body:
|
||||||
label: Version
|
label: Version
|
||||||
description: What version are you running? Look to AYON Tray
|
description: What version are you running? Look to AYON Tray
|
||||||
options:
|
options:
|
||||||
|
- 1.6.13
|
||||||
- 1.6.12
|
- 1.6.12
|
||||||
- 1.6.11
|
- 1.6.11
|
||||||
- 1.6.10
|
- 1.6.10
|
||||||
|
|
|
||||||
|
|
@ -185,9 +185,14 @@ class IPluginPaths(AYONInterface):
|
||||||
"""
|
"""
|
||||||
return self._get_plugin_paths_by_type("inventory")
|
return self._get_plugin_paths_by_type("inventory")
|
||||||
|
|
||||||
def get_loader_action_plugin_paths(self) -> list[str]:
|
def get_loader_action_plugin_paths(
|
||||||
|
self, host_name: Optional[str]
|
||||||
|
) -> list[str]:
|
||||||
"""Receive loader action plugin paths.
|
"""Receive loader action plugin paths.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
host_name (Optional[str]): Current host name.
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
list[str]: Paths to loader action plugins.
|
list[str]: Paths to loader action plugins.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@ from dataclasses import dataclass
|
||||||
import ayon_api
|
import ayon_api
|
||||||
|
|
||||||
from ayon_core import AYON_CORE_ROOT
|
from ayon_core import AYON_CORE_ROOT
|
||||||
from ayon_core.lib import StrEnum, Logger
|
from ayon_core.lib import StrEnum, Logger, is_func_signature_supported
|
||||||
from ayon_core.host import AbstractHost
|
from ayon_core.host import AbstractHost
|
||||||
from ayon_core.addon import AddonsManager, IPluginPaths
|
from ayon_core.addon import AddonsManager, IPluginPaths
|
||||||
from ayon_core.settings import get_studio_settings, get_project_settings
|
from ayon_core.settings import get_studio_settings, get_project_settings
|
||||||
|
|
@ -752,6 +752,7 @@ class LoaderActionsContext:
|
||||||
|
|
||||||
def _get_plugins(self) -> dict[str, LoaderActionPlugin]:
|
def _get_plugins(self) -> dict[str, LoaderActionPlugin]:
|
||||||
if self._plugins is None:
|
if self._plugins is None:
|
||||||
|
host_name = self.get_host_name()
|
||||||
addons_manager = self.get_addons_manager()
|
addons_manager = self.get_addons_manager()
|
||||||
all_paths = [
|
all_paths = [
|
||||||
os.path.join(AYON_CORE_ROOT, "plugins", "loader")
|
os.path.join(AYON_CORE_ROOT, "plugins", "loader")
|
||||||
|
|
@ -759,7 +760,24 @@ class LoaderActionsContext:
|
||||||
for addon in addons_manager.addons:
|
for addon in addons_manager.addons:
|
||||||
if not isinstance(addon, IPluginPaths):
|
if not isinstance(addon, IPluginPaths):
|
||||||
continue
|
continue
|
||||||
paths = addon.get_loader_action_plugin_paths()
|
|
||||||
|
try:
|
||||||
|
if is_func_signature_supported(
|
||||||
|
addon.get_loader_action_plugin_paths,
|
||||||
|
host_name
|
||||||
|
):
|
||||||
|
paths = addon.get_loader_action_plugin_paths(
|
||||||
|
host_name
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
paths = addon.get_loader_action_plugin_paths()
|
||||||
|
except Exception:
|
||||||
|
self._log.warning(
|
||||||
|
"Failed to get plugin paths for addon",
|
||||||
|
exc_info=True
|
||||||
|
)
|
||||||
|
continue
|
||||||
|
|
||||||
if paths:
|
if paths:
|
||||||
all_paths.extend(paths)
|
all_paths.extend(paths)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -401,6 +401,10 @@ class ExtractReview(pyblish.api.InstancePlugin):
|
||||||
new_staging_dir,
|
new_staging_dir,
|
||||||
self.log
|
self.log
|
||||||
)
|
)
|
||||||
|
# The OIIO conversion will remap the RGBA channels just to
|
||||||
|
# `R,G,B,A` so we will pass the intermediate file to FFMPEG
|
||||||
|
# without layer name.
|
||||||
|
layer_name = ""
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self._render_output_definitions(
|
self._render_output_definitions(
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
|
||||||
"unreal",
|
"unreal",
|
||||||
"houdini",
|
"houdini",
|
||||||
"batchdelivery",
|
"batchdelivery",
|
||||||
|
"webpublisher",
|
||||||
]
|
]
|
||||||
settings_category = "core"
|
settings_category = "core"
|
||||||
enabled = False
|
enabled = False
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
"""Package declaring AYON addon 'core' version."""
|
"""Package declaring AYON addon 'core' version."""
|
||||||
__version__ = "1.6.12+dev"
|
__version__ = "1.6.13+dev"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
name = "core"
|
name = "core"
|
||||||
title = "Core"
|
title = "Core"
|
||||||
version = "1.6.12+dev"
|
version = "1.6.13+dev"
|
||||||
|
|
||||||
client_dir = "ayon_core"
|
client_dir = "ayon_core"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "ayon-core"
|
name = "ayon-core"
|
||||||
version = "1.6.12+dev"
|
version = "1.6.13+dev"
|
||||||
description = ""
|
description = ""
|
||||||
authors = ["Ynput Team <team@ynput.io>"]
|
authors = ["Ynput Team <team@ynput.io>"]
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue