mirror of
https://github.com/ynput/ayon-core.git
synced 2026-01-01 16:34:53 +01:00
Merge remote-tracking branch 'upstream/develop' into maya_new_publisher
# Conflicts: # openpype/hosts/maya/plugins/create/create_look.py # openpype/hosts/maya/plugins/create/create_review.py # openpype/hosts/maya/plugins/publish/collect_instances.py # openpype/hosts/maya/plugins/publish/validate_attributes.py # openpype/hosts/maya/plugins/publish/validate_frame_range.py # openpype/hosts/maya/plugins/publish/validate_maya_units.py # openpype/hosts/maya/plugins/publish/validate_mesh_overlapping_uvs.py # openpype/modules/deadline/plugins/publish/collect_pools.py
This commit is contained in:
parent
fd6285399e
commit
14d767a97a
295 changed files with 10651 additions and 8683 deletions
|
|
@ -9,7 +9,7 @@ from abc import ABCMeta, abstractmethod, abstractproperty
|
|||
import six
|
||||
import clique
|
||||
|
||||
# Global variable which store attribude definitions by type
|
||||
# Global variable which store attribute definitions by type
|
||||
# - default types are registered on import
|
||||
_attr_defs_by_type = {}
|
||||
|
||||
|
|
@ -93,7 +93,7 @@ class AbstractAttrDefMeta(ABCMeta):
|
|||
|
||||
@six.add_metaclass(AbstractAttrDefMeta)
|
||||
class AbstractAttrDef(object):
|
||||
"""Abstraction of attribute definiton.
|
||||
"""Abstraction of attribute definition.
|
||||
|
||||
Each attribute definition must have implemented validation and
|
||||
conversion method.
|
||||
|
|
@ -427,7 +427,7 @@ class EnumDef(AbstractAttrDef):
|
|||
"""Enumeration of single item from items.
|
||||
|
||||
Args:
|
||||
items: Items definition that can be coverted using
|
||||
items: Items definition that can be converted using
|
||||
'prepare_enum_items'.
|
||||
default: Default value. Must be one key(value) from passed items.
|
||||
"""
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue