Merge branch 'develop' into bugfix/OP-4820_maya_tile_assembly_fail_in_draft

# Conflicts: # openpype/modules/deadline/plugins/publish/submit_maya_deadline.py # website/docs/module_deadline.md
2026-01-01 16:34:53 +01:00 · 2023-03-14 14:53:51 +00:00 · 2023-03-14 14:53:51 +00:00 · 32b42a5043
commit 32b42a5043
parent d3305ddbd5 7e4357b4f2
159 changed files with 4220 additions and 1191 deletions
--- a/openpype/settings/defaults/project_settings/deadline.json
+++ b/openpype/settings/defaults/project_settings/deadline.json
@ -52,7 +52,6 @@
            "enabled": true,
            "optional": false,
            "active": true,
-            "use_published": true,
            "priority": 50,
            "chunk_size": 10,
            "concurrent_tasks": 1,
--- a/openpype/settings/defaults/project_settings/global.json
+++ b/openpype/settings/defaults/project_settings/global.json
@ -139,7 +139,8 @@
                            "ext": "mp4",
                            "tags": [
                                "burnin",
-                                "ftrackreview"
+                                "ftrackreview",
+                                "kitsureview"
                            ],
                            "burnins": [],
                            "ffmpeg_args": {
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@ -179,6 +179,13 @@
                "Main"
            ]
        },
+        "CreateReview": {
+            "enabled": true,
+            "defaults": [
+                "Main"
+            ],
+            "useMayaTimeline": true
+        },
        "CreateAss": {
            "enabled": true,
            "defaults": [
@ -255,12 +262,6 @@
                "Main"
            ]
        },
-        "CreateReview": {
-            "enabled": true,
-            "defaults": [
-                "Main"
-            ]
-        },
        "CreateRig": {
            "enabled": true,
            "defaults": [
@ -329,6 +330,11 @@
            "optional": true,
            "active": true
        },
+        "ValidateMayaColorSpace": {
+            "enabled": true,
+            "optional": true,
+            "active": true
+        },
        "ValidateAttributes": {
            "enabled": false,
            "attributes": {}
--- a/openpype/settings/defaults/project_settings/nuke.json
+++ b/openpype/settings/defaults/project_settings/nuke.json
@ -565,7 +565,17 @@
        ]
    },
    "templated_workfile_build": {
-        "profiles": []
+        "profiles": [
+            {
+                "task_types": [
+                    "Compositing"
+                ],
+                "task_names": [],
+                "path": "{project[name]}/templates/comp.nk",
+                "keep_placeholder": true,
+                "create_first_version": true
+            }
+        ]
    },
    "filters": {}
 }
--- a/openpype/settings/entities/schemas/README.md
+++ b/openpype/settings/entities/schemas/README.md
@ -350,7 +350,7 @@ How output of the schema could look like on save:
 - number input, can be used for both integer and float
    - key `"decimal"` defines how many decimal places will be used, 0 is for integer input (Default: `0`)
    - key `"minimum"` as minimum allowed number to enter (Default: `-99999`)
-    - key `"maxium"` as maximum allowed number to enter (Default: `99999`)
+    - key `"maximum"` as maximum allowed number to enter (Default: `99999`)
 - key `"steps"` will change single step value of UI inputs (using arrows and wheel scroll)
 - for UI it is possible to show slider to enable this option set `show_slider` to `true`
 ```
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
@ -285,11 +285,6 @@
                            "key": "active",
                            "label": "Active"
                        },
-                        {
-                            "type": "boolean",
-                            "key": "use_published",
-                            "label": "Use Published scene"
-                        },
                        {
                            "type": "splitter"
                        },
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_anatomy_attributes.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_anatomy_attributes.json
@ -10,7 +10,7 @@
            "type": "number",
            "key": "fps",
            "label": "Frame Rate",
-            "decimal": 2,
+            "decimal": 3,
            "minimum": 0
        },
        {
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json
@ -240,6 +240,31 @@
                }
            ]
        },
+        {
+            "type": "dict",
+            "collapsible": true,
+            "key": "CreateReview",
+            "label": "Create Review",
+            "checkbox_key": "enabled",
+            "children": [
+                {
+                    "type": "boolean",
+                    "key": "enabled",
+                    "label": "Enabled"
+                },
+                {
+                    "type": "list",
+                    "key": "defaults",
+                    "label": "Default Subsets",
+                    "object_type": "text"
+                },
+                {
+                    "type": "boolean",
+                    "key": "useMayaTimeline",
+                    "label": "Use Maya Timeline for Frame Range."
+                }
+            ]
+        },
        {
            "type": "dict",
            "collapsible": true,
@ -398,10 +423,6 @@
                    "key": "CreateRenderSetup",
                    "label": "Create Render Setup"
                },
-                {
-                    "key": "CreateReview",
-                    "label": "Create Review"
-                },
                {
                    "key": "CreateRig",
                    "label": "Create Rig"
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
@ -144,6 +144,10 @@
                {
                    "key": "ValidateShadingEngine",
                    "label": "Validate Look Shading Engine Naming"
+                },
+                {
+                    "key": "ValidateMayaColorSpace",
+                    "label": "ValidateMayaColorSpace"
                }
            ]
        },
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_representation_tags.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_representation_tags.json
@ -16,6 +16,9 @@
        {
            "shotgridreview": "Add review to Shotgrid"
        },
+        {
+            "kitsureview": "Add review to Kitsu"
+        },
        {
            "delete": "Delete output"
        },
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_templated_workfile_build.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_templated_workfile_build.json
@ -34,6 +34,12 @@
                        "label": "Keep placeholders",
                        "type": "boolean",
                        "default": true
+                    },
+                    {
+                        "key": "create_first_version",
+                        "label": "Create first version",
+                        "type": "boolean",
+                        "default": true
                    }
                ]
            }