mirror of
https://github.com/ynput/ayon-core.git
synced 2025-12-24 12:54:40 +01:00
Merge remote-tracking branch 'origin/enhancement/1296-product-base-types-support-in-integrator' into enhancement/1296-product-base-types-support-in-integrator
This commit is contained in:
commit
acd1fcb0cf
3 changed files with 30 additions and 3 deletions
|
|
@ -185,9 +185,14 @@ class IPluginPaths(AYONInterface):
|
|||
"""
|
||||
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.
|
||||
|
||||
Args:
|
||||
host_name (Optional[str]): Current host name.
|
||||
|
||||
Returns:
|
||||
list[str]: Paths to loader action plugins.
|
||||
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ from dataclasses import dataclass
|
|||
import ayon_api
|
||||
|
||||
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.addon import AddonsManager, IPluginPaths
|
||||
from ayon_core.settings import get_studio_settings, get_project_settings
|
||||
|
|
@ -752,6 +752,7 @@ class LoaderActionsContext:
|
|||
|
||||
def _get_plugins(self) -> dict[str, LoaderActionPlugin]:
|
||||
if self._plugins is None:
|
||||
host_name = self.get_host_name()
|
||||
addons_manager = self.get_addons_manager()
|
||||
all_paths = [
|
||||
os.path.join(AYON_CORE_ROOT, "plugins", "loader")
|
||||
|
|
@ -759,7 +760,24 @@ class LoaderActionsContext:
|
|||
for addon in addons_manager.addons:
|
||||
if not isinstance(addon, IPluginPaths):
|
||||
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:
|
||||
all_paths.extend(paths)
|
||||
|
||||
|
|
|
|||
|
|
@ -401,6 +401,10 @@ class ExtractReview(pyblish.api.InstancePlugin):
|
|||
new_staging_dir,
|
||||
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:
|
||||
self._render_output_definitions(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue