Merge branch 'develop' into feature/maya_testing

server_addon/create_ayon_addons.py

@@ -1,7 +1,6 @@
 import os
 import sys
 import re
-import json
 import shutil
 import argparse
 import zipfile
@@ -220,7 +219,6 @@ def main(
     addons=None,
 ):
     current_dir = Path(os.path.dirname(os.path.abspath(__file__)))
-    root_dir = current_dir.parent
     create_zip = not skip_zip
 
     if output_dir:

server_addon/maya/server/settings/main.py

@@ -30,6 +30,15 @@ class ExtMappingItemModel(BaseSettingsModel):
 class MayaSettings(BaseSettingsModel):
     """Maya Project Settings."""
 
+    use_cbid_workflow: bool = SettingsField(
+        True, title="Use cbId workflow",
+        description=(
+            "When enabled, a per node `cbId` identifier will be created and "
+            "validated for many product types. This is then used for look "
+            "publishing and many others. By disabling this, the `cbId` "
+            "attribute will still be created on scene save but it will not "
+            "be validated."))
+
     open_workfile_post_initialization: bool = SettingsField(
         True, title="Open Workfile Post Initialization")
     explicit_plugins_loading: ExplicitPluginsLoadingModel = SettingsField(
@@ -88,6 +97,7 @@ DEFAULT_MEL_WORKSPACE_SETTINGS = "\n".join((
 ))
 
 DEFAULT_MAYA_SETTING = {
+    "use_cbid_workflow": True,
     "open_workfile_post_initialization": True,
     "explicit_plugins_loading": DEFAULT_EXPLITCIT_PLUGINS_LOADING_SETTINGS,
     "imageio": DEFAULT_IMAGEIO_SETTINGS,

server_addon/maya/server/settings/publishers.py

@@ -315,14 +315,13 @@ class ExtractMayaSceneRawModel(BaseSettingsModel):
 
 
 class ExtractCameraAlembicModel(BaseSettingsModel):
-    """
-    List of attributes that will be added to the baked alembic camera. Needs to be written in python list syntax.
-    """
     enabled: bool = SettingsField(title="ExtractCameraAlembic")
     optional: bool = SettingsField(title="Optional")
     active: bool = SettingsField(title="Active")
     bake_attributes: str = SettingsField(
-        "[]", title="Base Attributes", widget="textarea"
+        "[]", title="Bake Attributes", widget="textarea",
+        description="List of attributes that will be included in the alembic "
+                    "camera export. Needs to be written as a JSON list.",
     )
 
     @validator("bake_attributes")

server_addon/maya/server/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring addon version."""
-__version__ = "0.1.10"
+__version__ = "0.1.11"

server_addon/nuke/server/settings/main.py

@@ -1,7 +1,6 @@
 from ayon_server.settings import (
     BaseSettingsModel,
     SettingsField,
-    ensure_unique_names
 )
 
 from .general import (

server_addon/tvpaint/server/settings/main.py

@@ -1,7 +1,6 @@
 from ayon_server.settings import (
     BaseSettingsModel,
     SettingsField,
-    ensure_unique_names,
 )
 
 from .imageio import TVPaintImageIOModel