Merge branch 'develop' into feature/OP-3819_Move-subset-name-functionality

This commit is contained in:
Jakub Trllo 2022-08-26 14:59:49 +02:00
commit 9e7abf5804
256 changed files with 36610 additions and 1430 deletions

View file

@ -13,10 +13,8 @@ from openpype.client import (
get_assets,
get_asset_ids_with_subsets,
)
from openpype.lib import (
CURRENT_DOC_SCHEMAS,
PypeLogger,
)
from openpype.client.operations import CURRENT_ASSET_DOC_SCHEMA
from openpype.lib import Logger
from .constants import (
IDENTIFIER_ROLE,
@ -203,7 +201,7 @@ class HierarchyModel(QtCore.QAbstractItemModel):
@property
def log(self):
if self._log is None:
self._log = PypeLogger.get_logger("ProjectManagerModel")
self._log = Logger.get_logger("ProjectManagerModel")
return self._log
@property
@ -1961,7 +1959,7 @@ class AssetItem(BaseItem):
}
schema_name = (
self._origin_asset_doc.get("schema")
or CURRENT_DOC_SCHEMAS["asset"]
or CURRENT_ASSET_DOC_SCHEMA
)
doc = {

View file

@ -5,8 +5,8 @@ from .constants import (
NAME_ALLOWED_SYMBOLS,
NAME_REGEX
)
from openpype.lib import (
create_project,
from openpype.lib import create_project
from openpype.client.operations import (
PROJECT_NAME_ALLOWED_SYMBOLS,
PROJECT_NAME_REGEX
)

View file

@ -39,7 +39,7 @@ class BaseInfoDialog(QtWidgets.QDialog):
):
other_information_layout.addRow(
label,
QtWidgets.QLabel(value, other_information)
QtWidgets.QLabel(value or "N/A", other_information)
)
timestamp_label = QtWidgets.QLabel(