Merge branch 'develop' into bugfix/AY-4004_Maya-optional-validator-not-shown-in-publish-context

This commit is contained in:
Kayla Man 2024-03-20 09:09:15 +01:00 committed by GitHub
commit 8a37ca1f20
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 10 additions and 14 deletions

View file

@ -7,9 +7,9 @@ loader will use them instead of native vray vrmesh format.
"""
import os
from ayon_api import get_representation_by_name
import maya.cmds as cmds
import ayon_api
from ayon_core.settings import get_project_settings
from ayon_core.pipeline import (
load,

View file

@ -1,10 +1,7 @@
import collections
from ayon_core.lib.attribute_definitions import BoolDef
from ayon_core.pipeline import (
get_representation_context,
registered_host,
)
from ayon_core.pipeline import registered_host
from ayon_core.hosts.tvpaint.api import plugin
from ayon_core.hosts.tvpaint.api.lib import (
get_layers_data,
@ -218,10 +215,7 @@ class LoadImage(plugin.Loader):
removed.
"""
repre_entity = context["representation"]
# Create new containers first
context = get_representation_context(repre_entity["id"])
# Get layer ids from previous container
old_layer_names = self.get_members_from_container(container)

View file

@ -1953,11 +1953,11 @@ class CreateContext:
"""Trigger create of plugins with standartized arguments.
Arguments 'folder_entity' and 'task_name' use current context as
default values. If only 'task_name' is provided it will be overriden
by task name from current context. If 'task_name' is not provided
when 'folder_entity' is, it is considered that task name is not
specified, which can lead to error if product name template requires
task name.
default values. If only 'task_entity' is provided it will be
overridden by task name from current context. If 'task_name' is not
provided when 'folder_entity' is, it is considered that task name is
not specified, which can lead to error if product name template
requires task name.
Args:
creator_identifier (str): Identifier of creator plugin.
@ -1986,6 +1986,8 @@ class CreateContext:
raise CreatorError(
"Folder '{}' was not found".format(folder_path)
)
task_name = None
if task_entity is None:
task_name = self.get_current_task_name()
task_entity = ayon_api.get_task_by_name(

View file

@ -240,7 +240,7 @@ class SwitchAssetDialog(QtWidgets.QDialog):
return ayon_api.get_last_versions(
project_name,
product_ids,
fields={"id", "folderId", "version"}
fields={"id", "productId", "version"}
)
def _on_show_timer(self):