diff --git a/pype/plugins/ftrack/publish/validate_custom_ftrack_attributes.py b/pype/plugins/ftrack/publish/validate_custom_ftrack_attributes.py
index 4bddcd2e03..ed3fdc75ac 100644
--- a/pype/plugins/ftrack/publish/validate_custom_ftrack_attributes.py
+++ b/pype/plugins/ftrack/publish/validate_custom_ftrack_attributes.py
@@ -61,8 +61,12 @@ class ValidateFtrackAttributes(pyblish.api.InstancePlugin):
"Missing FTrack Task entity in context")
host = pyblish.api.current_host()
- to_check = context.data["presets"].get(
- host, {}).get("ftrack_custom_attributes")
+ to_check = (
+ context.data["project_settings"]
+ ["ftrack"]
+ .get(host, {})
+ .get("ftrack_custom_attributes")
+ )
if not to_check:
self.log.warning("ftrack_attributes preset not found")
return
diff --git a/pype/plugins/maya/create/create_render.py b/pype/plugins/maya/create/create_render.py
index a3700e2f60..bdd237a54e 100644
--- a/pype/plugins/maya/create/create_render.py
+++ b/pype/plugins/maya/create/create_render.py
@@ -202,7 +202,7 @@ class CreateRender(avalon.maya.Creator):
"""Load Muster credentials.
Load Muster credentials from file and set ``MUSTER_USER``,
- ``MUSTER_PASSWORD``, ``MUSTER_REST_URL`` is loaded from presets.
+ ``MUSTER_PASSWORD``, ``MUSTER_REST_URL`` is loaded from settings.
Raises:
RuntimeError: If loaded credentials are invalid.
diff --git a/pype/plugins/maya/create/create_rendersetup.py b/pype/plugins/maya/create/create_rendersetup.py
index 969c085ea6..40e3731bf0 100644
--- a/pype/plugins/maya/create/create_rendersetup.py
+++ b/pype/plugins/maya/create/create_rendersetup.py
@@ -15,7 +15,7 @@ class CreateRenderSetup(avalon.maya.Creator):
super(CreateRenderSetup, self).__init__(*args, **kwargs)
# here we can pre-create renderSetup layers, possibly utlizing
- # presets for it.
+ # settings for it.
# _____
# / __\__
diff --git a/pype/plugins/maya/publish/extract_camera_mayaScene.py b/pype/plugins/maya/publish/extract_camera_mayaScene.py
index 0443357ba9..a1854b1db0 100644
--- a/pype/plugins/maya/publish/extract_camera_mayaScene.py
+++ b/pype/plugins/maya/publish/extract_camera_mayaScene.py
@@ -102,10 +102,11 @@ class ExtractCameraMayaScene(pype.api.Extractor):
def process(self, instance):
"""Plugin entry point."""
# get settings
- ext_mapping = (instance.context.data["presets"]["maya"]
- .get("ext_mapping")) # noqa: E501
+ ext_mapping = (
+ instance.context.data["project_settings"]["maya"]["ext_mapping"]
+ )
if ext_mapping:
- self.log.info("Looking in presets for scene type ...")
+ self.log.info("Looking in settings for scene type ...")
# use extension mapping for first family found
for family in self.families:
try:
diff --git a/pype/plugins/maya/publish/extract_maya_scene_raw.py b/pype/plugins/maya/publish/extract_maya_scene_raw.py
index 0e256bc69f..8df9f8e715 100644
--- a/pype/plugins/maya/publish/extract_maya_scene_raw.py
+++ b/pype/plugins/maya/publish/extract_maya_scene_raw.py
@@ -24,9 +24,11 @@ class ExtractMayaSceneRaw(pype.api.Extractor):
def process(self, instance):
"""Plugin entry point."""
- ext_mapping = instance.context.data["presets"]["maya"].get("ext_mapping") # noqa: E501
+ ext_mapping = (
+ instance.context.data["project_settings"]["maya"]["ext_mapping"]
+ )
if ext_mapping:
- self.log.info("Looking in presets for scene type ...")
+ self.log.info("Looking in settings for scene type ...")
# use extension mapping for first family found
for family in self.families:
try:
diff --git a/pype/plugins/maya/publish/extract_model.py b/pype/plugins/maya/publish/extract_model.py
index d77e65f989..8276d1a006 100644
--- a/pype/plugins/maya/publish/extract_model.py
+++ b/pype/plugins/maya/publish/extract_model.py
@@ -31,9 +31,11 @@ class ExtractModel(pype.api.Extractor):
def process(self, instance):
"""Plugin entry point."""
- ext_mapping = instance.context.data["presets"]["maya"].get("ext_mapping") # noqa: E501
+ ext_mapping = (
+ instance.context.data["project_settings"]["maya"]["ext_mapping"]
+ )
if ext_mapping:
- self.log.info("Looking in presets for scene type ...")
+ self.log.info("Looking in settings for scene type ...")
# use extension mapping for first family found
for family in self.families:
try:
diff --git a/pype/plugins/maya/publish/extract_playblast.py b/pype/plugins/maya/publish/extract_playblast.py
index 647d1f4503..82795ab9df 100644
--- a/pype/plugins/maya/publish/extract_playblast.py
+++ b/pype/plugins/maya/publish/extract_playblast.py
@@ -43,7 +43,9 @@ class ExtractPlayblast(pype.api.Extractor):
# get cameras
camera = instance.data['review_camera']
- capture_preset = instance.context.data['presets']['maya']['capture']
+ capture_preset = (
+ instance.context.data['project_settings']['maya']['capture']
+ )
try:
preset = lib.load_capture_preset(data=capture_preset)
diff --git a/pype/plugins/maya/publish/extract_rig.py b/pype/plugins/maya/publish/extract_rig.py
index 8ebeae4184..fd7fc051aa 100644
--- a/pype/plugins/maya/publish/extract_rig.py
+++ b/pype/plugins/maya/publish/extract_rig.py
@@ -18,9 +18,11 @@ class ExtractRig(pype.api.Extractor):
def process(self, instance):
"""Plugin entry point."""
- ext_mapping = instance.context.data["presets"]["maya"].get("ext_mapping") # noqa: E501
+ ext_mapping = (
+ instance.context.data["project_settings"]["maya"]["ext_mapping"]
+ )
if ext_mapping:
- self.log.info("Looking in presets for scene type ...")
+ self.log.info("Looking in settings for scene type ...")
# use extension mapping for first family found
for family in self.families:
try:
diff --git a/pype/plugins/maya/publish/extract_thumbnail.py b/pype/plugins/maya/publish/extract_thumbnail.py
index 524fc1e17c..6956341ffd 100644
--- a/pype/plugins/maya/publish/extract_thumbnail.py
+++ b/pype/plugins/maya/publish/extract_thumbnail.py
@@ -33,7 +33,10 @@ class ExtractThumbnail(pype.api.Extractor):
camera = instance.data['review_camera']
capture_preset = ""
- capture_preset = instance.context.data['presets']['maya']['capture']
+ capture_preset = (
+ instance.context.data["project_settings"]['maya']['capture']
+ )
+
try:
preset = lib.load_capture_preset(data=capture_preset)
except:
diff --git a/pype/plugins/maya/publish/extract_yeti_rig.py b/pype/plugins/maya/publish/extract_yeti_rig.py
index d48a956b88..71d4cf6198 100644
--- a/pype/plugins/maya/publish/extract_yeti_rig.py
+++ b/pype/plugins/maya/publish/extract_yeti_rig.py
@@ -101,9 +101,11 @@ class ExtractYetiRig(pype.api.Extractor):
def process(self, instance):
"""Plugin entry point."""
- ext_mapping = instance.context.data["presets"]["maya"].get("ext_mapping") # noqa: E501
+ ext_mapping = (
+ instance.context.data["project_settings"]["maya"]["ext_mapping"]
+ )
if ext_mapping:
- self.log.info("Looking in presets for scene type ...")
+ self.log.info("Looking in settings for scene type ...")
# use extension mapping for first family found
for family in self.families:
try:
diff --git a/pype/plugins/maya/publish/submit_maya_muster.py b/pype/plugins/maya/publish/submit_maya_muster.py
index 9c67b45721..37bb3ad4c8 100644
--- a/pype/plugins/maya/publish/submit_maya_muster.py
+++ b/pype/plugins/maya/publish/submit_maya_muster.py
@@ -153,7 +153,7 @@ class MayaSubmitMuster(pyblish.api.InstancePlugin):
def _load_credentials(self):
"""
Load Muster credentials from file and set `MUSTER_USER`,
- `MUSTER_PASSWORD`, `MUSTER_REST_URL` is loaded from presets.
+ `MUSTER_PASSWORD`, `MUSTER_REST_URL` is loaded from settings.
.. todo::
diff --git a/pype/plugins/maya/publish/validate_attributes.py b/pype/plugins/maya/publish/validate_attributes.py
index a77fbe5e93..97e63a475b 100644
--- a/pype/plugins/maya/publish/validate_attributes.py
+++ b/pype/plugins/maya/publish/validate_attributes.py
@@ -22,9 +22,12 @@ class ValidateAttributes(pyblish.api.ContextPlugin):
actions = [pype.api.RepairContextAction]
optional = True
+ attributes = None
+
def process(self, context):
# Check for preset existence.
- if not context.data["presets"]["maya"].get("attributes"):
+
+ if not self.attributes:
return
invalid = self.get_invalid(context, compute=True)
@@ -43,7 +46,6 @@ class ValidateAttributes(pyblish.api.ContextPlugin):
@classmethod
def get_invalid_attributes(cls, context):
- presets = context.data["presets"]["maya"]["attributes"]
invalid_attributes = []
for instance in context:
# Filter publisable instances.
@@ -53,23 +55,23 @@ class ValidateAttributes(pyblish.api.ContextPlugin):
# Filter families.
families = [instance.data["family"]]
families += instance.data.get("families", [])
- families = list(set(families) & set(presets.keys()))
+ families = list(set(families) & set(self.attributes.keys()))
if not families:
continue
# Get all attributes to validate.
attributes = {}
for family in families:
- for preset in presets[family]:
+ for preset in self.attributes[family]:
[node_name, attribute_name] = preset.split(".")
try:
attributes[node_name].update(
- {attribute_name: presets[family][preset]}
+ {attribute_name: self.attributes[family][preset]}
)
except KeyError:
attributes.update({
node_name: {
- attribute_name: presets[family][preset]
+ attribute_name: self.attributes[family][preset]
}
})
diff --git a/pype/plugins/maya/publish/validate_muster_connection.py b/pype/plugins/maya/publish/validate_muster_connection.py
index d125542cda..35acdb326f 100644
--- a/pype/plugins/maya/publish/validate_muster_connection.py
+++ b/pype/plugins/maya/publish/validate_muster_connection.py
@@ -58,7 +58,7 @@ class ValidateMusterConnection(pyblish.api.ContextPlugin):
def _load_credentials(self):
"""
Load Muster credentials from file and set `MUSTER_USER`,
- `MUSTER_PASSWORD`, `MUSTER_REST_URL` is loaded from presets.
+ `MUSTER_PASSWORD`, `MUSTER_REST_URL` is loaded from settings.
.. todo::
diff --git a/pype/settings/defaults/project_settings/ftrack.json b/pype/settings/defaults/project_settings/ftrack.json
index 023b85cb3b..5481574ef8 100644
--- a/pype/settings/defaults/project_settings/ftrack.json
+++ b/pype/settings/defaults/project_settings/ftrack.json
@@ -93,6 +93,10 @@
"enabled": true,
"note_with_intent_template": "",
"note_labels": []
+ },
+ "ValidateFtrackAttributes": {
+ "enabled": false,
+ "ftrack_custom_attributes": {}
}
}
}
\ No newline at end of file
diff --git a/pype/settings/defaults/project_settings/global.json b/pype/settings/defaults/project_settings/global.json
index 6661729e3d..da56fd34e7 100644
--- a/pype/settings/defaults/project_settings/global.json
+++ b/pype/settings/defaults/project_settings/global.json
@@ -111,7 +111,7 @@
}
},
"tools": {
- "Creator": {
+ "creator": {
"families_smart_select": {
"Render": [
"light",
@@ -179,4 +179,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/pype/settings/defaults/project_settings/maya.json b/pype/settings/defaults/project_settings/maya.json
index 10e3db2dd7..c779d495c4 100644
--- a/pype/settings/defaults/project_settings/maya.json
+++ b/pype/settings/defaults/project_settings/maya.json
@@ -1,5 +1,5 @@
{
- "maya_capture": {
+ "capture": {
"Codec": {
"compression": "jpg",
"format": "image",
@@ -107,6 +107,7 @@
"overscan": 1.0
}
},
+ "ext_mapping": {},
"publish": {
"CollectMayaRender": {
"sync_workfile_version": false
diff --git a/pype/tools/settings/settings/gui_schemas/projects_schema/schema_project_ftrack.json b/pype/tools/settings/settings/gui_schemas/projects_schema/schema_project_ftrack.json
index f54c1232a6..ea01400e94 100644
--- a/pype/tools/settings/settings/gui_schemas/projects_schema/schema_project_ftrack.json
+++ b/pype/tools/settings/settings/gui_schemas/projects_schema/schema_project_ftrack.json
@@ -6,261 +6,310 @@
"checkbox_key": "enabled",
"is_file": true,
"children": [
- {
- "type": "splitter"
- },
- {
- "type": "label",
- "label": "Additional Ftrack paths"
- },
- {
- "type": "list",
- "key": "ftrack_actions_path",
- "label": "Action paths",
- "object_type": "text"
- },
- {
- "type": "list",
- "key": "ftrack_events_path",
- "label": "Event paths",
- "object_type": "text"
- },
- {
- "type": "splitter"
- },
+ {
+ "type": "splitter"
+ },
+ {
+ "type": "label",
+ "label": "Additional Ftrack paths"
+ },
+ {
+ "type": "list",
+ "key": "ftrack_actions_path",
+ "label": "Action paths",
+ "object_type": "text"
+ },
+ {
+ "type": "list",
+ "key": "ftrack_events_path",
+ "label": "Event paths",
+ "object_type": "text"
+ },
+ {
+ "type": "splitter"
+ },
+ {
+ "type": "dict",
+ "key": "events",
+ "label": "Server Events",
+ "children": [
{
"type": "dict",
- "key": "events",
- "label": "Server Events",
+ "key": "sync_to_avalon",
+ "label": "Sync to avalon",
+ "checkbox_key": "enabled",
"children": [
- {
- "type": "dict",
- "key": "sync_to_avalon",
- "label": "Sync to avalon",
- "checkbox_key": "enabled",
- "children": [{
- "type": "boolean",
- "key": "enabled",
- "label": "Enabled"
- },
- {
- "type": "label",
- "label": "Allow name and hierarchy change only if following statuses are on all children tasks"
- },
- {
- "type": "list",
- "key": "statuses_name_change",
- "label": "Statuses",
- "object_type": {
- "type": "text",
- "multiline": false
- }
- }
- ]
- },
- {
- "type": "dict",
- "key": "push_frame_values_to_task",
- "label": "Sync Hierarchical and Entity Attributes",
- "checkbox_key": "enabled",
- "children": [{
- "type": "boolean",
- "key": "enabled",
- "label": "Enabled"
- }, {
- "type": "list",
- "key": "interest_entity_types",
- "label": "Entity types of interest",
- "object_type": {
- "type": "text",
- "multiline": false
- }
- }, {
- "type": "list",
- "key": "interest_attributess",
- "label": "Attributes to sync",
- "object_type": {
- "type": "text",
- "multiline": false
- }
- }]
- },
- {
- "type": "dict",
- "key": "thumbnail_updates",
- "label": "Update Hierarchy thumbnails",
- "checkbox_key": "enabled",
- "children": [{
- "type": "boolean",
- "key": "enabled",
- "label": "Enabled"
- },{
- "type": "label",
- "label": "Push thumbnail from version, up through multiple hierarchy levels."
- },{
- "type": "number",
- "key": "levels",
- "label": "Levels"
- }]
- },
- {
- "type": "dict",
- "key": "user_assignment",
- "label": "Run script on user assignments",
- "checkbox_key": "enabled",
- "children": [{
- "type": "boolean",
- "key": "enabled",
- "label": "Enabled"
- }]
- },
+ {
+ "type": "boolean",
+ "key": "enabled",
+ "label": "Enabled"
+ },
+ {
+ "type": "label",
+ "label": "Allow name and hierarchy change only if following statuses are on all children tasks"
+ },
+ {
+ "type": "list",
+ "key": "statuses_name_change",
+ "label": "Statuses",
+ "object_type":
{
- "type": "dict",
- "key": "status_update",
- "label": "Update status on task action",
- "checkbox_key": "enabled",
- "children": [{
- "type": "boolean",
- "key": "enabled",
- "label": "Enabled"
- },
- {
- "key": "mapping",
- "type": "dict-modifiable",
- "object_type": {
- "type": "list",
- "object_type": "text"
- }
- }]
- },
- {
- "type": "dict",
- "key": "status_task_to_parent",
- "label": "Sync status from Task to Parent",
- "checkbox_key": "enabled",
- "children": [{
- "type": "boolean",
- "key": "enabled",
- "label": "Enabled"
- },
- {
- "key": "parent_status_match_all_task_statuses",
- "type": "dict-modifiable",
- "label": "Change parent if all tasks match",
- "object_type": {
- "type": "list",
- "object_type": "text"
- }
- },
- {
- "key": "parent_status_by_task_status",
- "type": "dict-modifiable",
- "label": "Change parent status if a single task matches",
- "object_type": {
- "type": "list",
- "object_type": "text"
- }
- }]
- },
- {
- "type": "dict",
- "key": "status_task_to_version",
- "label": "Sync status from Task to Version",
- "checkbox_key": "enabled",
- "children": [{
- "type": "boolean",
- "key": "enabled",
- "label": "Enabled"
- }, {
- "type": "dict-modifiable",
- "key": "mapping",
- "object_type": {
- "type": "list",
- "object_type": "text"
- }
- }]
- },
- {
- "type": "dict",
- "key": "status_version_to_task",
- "label": "Sync status from Version to Task",
- "checkbox_key": "enabled",
- "children": [{
- "type": "boolean",
- "key": "enabled",
- "label": "Enabled"
- }, {
- "type": "dict-modifiable",
- "key": "mapping",
- "object_type": {
- "type": "list",
- "object_type": "text"
- }
- }]
- },
- {
- "type": "dict",
- "key": "first_version_status",
- "label": "Set status on first created version",
- "checkbox_key": "enabled",
- "children": [{
- "type": "boolean",
- "key": "enabled",
- "label": "Enabled"
- },{
- "type": "text",
- "key": "status",
- "label": "Status"
- }
- ]
- },
- {
- "type": "dict",
- "key": "next_task_update",
- "label": "Update status on next task",
- "checkbox_key": "enabled",
- "children": [{
- "type": "boolean",
- "key": "enabled",
- "label": "Enabled"
- },{
- "type": "dict-modifiable",
- "key": "mapping",
- "object_type": {
- "type": "text"
- }
- }]
+ "type": "text",
+ "multiline": false
}
- ]
+ }]
},
{
"type": "dict",
- "collapsable": true,
- "key": "publish",
- "label": "Publish plugins",
- "is_file": true,
- "children": [{
+ "key": "push_frame_values_to_task",
+ "label": "Sync Hierarchical and Entity Attributes",
+ "checkbox_key": "enabled",
+ "children": [
+ {
+ "type": "boolean",
+ "key": "enabled",
+ "label": "Enabled"
+ },
+ {
+ "type": "list",
+ "key": "interest_entity_types",
+ "label": "Entity types of interest",
+ "object_type":
+ {
+ "type": "text",
+ "multiline": false
+ }
+ },
+ {
+ "type": "list",
+ "key": "interest_attributess",
+ "label": "Attributes to sync",
+ "object_type":
+ {
+ "type": "text",
+ "multiline": false
+ }
+ }]
+ },
+ {
+ "type": "dict",
+ "key": "thumbnail_updates",
+ "label": "Update Hierarchy thumbnails",
+ "checkbox_key": "enabled",
+ "children": [
+ {
+ "type": "boolean",
+ "key": "enabled",
+ "label": "Enabled"
+ },
+ {
+ "type": "label",
+ "label": "Push thumbnail from version, up through multiple hierarchy levels."
+ },
+ {
+ "type": "number",
+ "key": "levels",
+ "label": "Levels"
+ }]
+ },
+ {
+ "type": "dict",
+ "key": "user_assignment",
+ "label": "Run script on user assignments",
+ "checkbox_key": "enabled",
+ "children": [
+ {
+ "type": "boolean",
+ "key": "enabled",
+ "label": "Enabled"
+ }]
+ },
+ {
+ "type": "dict",
+ "key": "status_update",
+ "label": "Update status on task action",
+ "checkbox_key": "enabled",
+ "children": [
+ {
+ "type": "boolean",
+ "key": "enabled",
+ "label": "Enabled"
+ },
+ {
+ "key": "mapping",
+ "type": "dict-modifiable",
+ "object_type":
+ {
+ "type": "list",
+ "object_type": "text"
+ }
+ }]
+ },
+ {
+ "type": "dict",
+ "key": "status_task_to_parent",
+ "label": "Sync status from Task to Parent",
+ "checkbox_key": "enabled",
+ "children": [
+ {
+ "type": "boolean",
+ "key": "enabled",
+ "label": "Enabled"
+ },
+ {
+ "key": "parent_status_match_all_task_statuses",
+ "type": "dict-modifiable",
+ "label": "Change parent if all tasks match",
+ "object_type":
+ {
+ "type": "list",
+ "object_type": "text"
+ }
+ },
+ {
+ "key": "parent_status_by_task_status",
+ "type": "dict-modifiable",
+ "label": "Change parent status if a single task matches",
+ "object_type":
+ {
+ "type": "list",
+ "object_type": "text"
+ }
+ }]
+ },
+ {
+ "type": "dict",
+ "key": "status_task_to_version",
+ "label": "Sync status from Task to Version",
+ "checkbox_key": "enabled",
+ "children": [
+ {
+ "type": "boolean",
+ "key": "enabled",
+ "label": "Enabled"
+ },
+ {
+ "type": "dict-modifiable",
+ "key": "mapping",
+ "object_type":
+ {
+ "type": "list",
+ "object_type": "text"
+ }
+ }]
+ },
+ {
+ "type": "dict",
+ "key": "status_version_to_task",
+ "label": "Sync status from Version to Task",
+ "checkbox_key": "enabled",
+ "children": [
+ {
+ "type": "boolean",
+ "key": "enabled",
+ "label": "Enabled"
+ },
+ {
+ "type": "dict-modifiable",
+ "key": "mapping",
+ "object_type":
+ {
+ "type": "list",
+ "object_type": "text"
+ }
+ }]
+ },
+ {
+ "type": "dict",
+ "key": "first_version_status",
+ "label": "Set status on first created version",
+ "checkbox_key": "enabled",
+ "children": [
+ {
+ "type": "boolean",
+ "key": "enabled",
+ "label": "Enabled"
+ },
+ {
+ "type": "text",
+ "key": "status",
+ "label": "Status"
+ }]
+ },
+ {
+ "type": "dict",
+ "key": "next_task_update",
+ "label": "Update status on next task",
+ "checkbox_key": "enabled",
+ "children": [
+ {
+ "type": "boolean",
+ "key": "enabled",
+ "label": "Enabled"
+ },
+ {
+ "type": "dict-modifiable",
+ "key": "mapping",
+ "object_type":
+ {
+ "type": "text"
+ }
+ }]
+ }]
+ },
+ {
+ "type": "dict",
+ "collapsable": true,
+ "key": "publish",
+ "label": "Publish plugins",
+ "is_file": true,
+ "children": [
+ {
"type": "dict",
"collapsable": true,
"checkbox_key": "enabled",
"key": "IntegrateFtrackNote",
"label": "IntegrateFtrackNote",
"is_group": true,
- "children": [{
+ "children": [
+ {
"type": "boolean",
"key": "enabled",
"label": "Enabled"
- }, {
+ },
+ {
"type": "text",
"key": "note_with_intent_template",
"label": "Note with intent template"
- }, {
+ },
+ {
"type": "list",
"object_type": "text",
"key": "note_labels",
"label": "Note labels"
}]
- }]
- }
- ]
+ },
+
+ {
+ "type": "dict",
+ "collapsable": true,
+ "checkbox_key": "enabled",
+ "key": "ValidateFtrackAttributes",
+ "label": "ValidateFtrackAttributes",
+ "is_group": true,
+ "children": [
+ {
+ "type": "boolean",
+ "key": "enabled",
+ "label": "Enabled"
+ },
+ {
+ "type": "raw-json",
+ "key": "ftrack_custom_attributes",
+ "label": "Custom attributes to validate"
+ }]
+ }
+
+ ]
+ }]
}
diff --git a/pype/tools/settings/settings/gui_schemas/projects_schema/schemas/schema_global_tools.json b/pype/tools/settings/settings/gui_schemas/projects_schema/schemas/schema_global_tools.json
index 529794fd28..21b953d64b 100644
--- a/pype/tools/settings/settings/gui_schemas/projects_schema/schemas/schema_global_tools.json
+++ b/pype/tools/settings/settings/gui_schemas/projects_schema/schemas/schema_global_tools.json
@@ -7,7 +7,7 @@
{
"type": "dict",
"collapsable": true,
- "key": "Creator",
+ "key": "creator",
"label": "Creator",
"children": [
{
diff --git a/pype/tools/settings/settings/gui_schemas/projects_schema/schemas/schema_maya_capture.json b/pype/tools/settings/settings/gui_schemas/projects_schema/schemas/schema_maya_capture.json
index 314fdc7514..8c2c6c1884 100644
--- a/pype/tools/settings/settings/gui_schemas/projects_schema/schemas/schema_maya_capture.json
+++ b/pype/tools/settings/settings/gui_schemas/projects_schema/schemas/schema_maya_capture.json
@@ -1,506 +1,586 @@
{
- "type": "dict",
- "collapsable": true,
- "key": "maya_capture",
- "label": "Maya Playblast settings",
- "is_file": true,
+ "type": "collapsible-wrap",
+ "label": "Collapsible Wrapper without key",
"children": [
- {
+ {
"type": "dict",
- "key": "Codec",
+ "collapsable": true,
+ "key": "capture",
+ "label": "Maya Playblast settings",
+ "is_file": true,
"children": [
- {
- "type": "label",
- "label": "Codec"
- },
- {
- "type": "text",
- "key": "compression",
- "label": "Compression type"
- }, {
- "type": "text",
- "key": "format",
- "label": "Data format"
- }, {
- "type": "number",
- "key": "quality",
- "label": "Quality",
- "decimal": 0,
- "minimum": 0,
- "maximum": 100
- },
+ {
+ "type": "dict",
+ "key": "Codec",
+ "children": [
+ {
+ "type": "label",
+ "label": "Codec"
+ },
+ {
+ "type": "text",
+ "key": "compression",
+ "label": "Compression type"
+ },
+ {
+ "type": "text",
+ "key": "format",
+ "label": "Data format"
+ },
+ {
+ "type": "number",
+ "key": "quality",
+ "label": "Quality",
+ "decimal": 0,
+ "minimum": 0,
+ "maximum": 100
+ },
- {
- "type": "splitter"
- }
- ]
- }, {
- "type": "dict",
- "key": "Display Options",
- "children": [
- {
- "type": "label",
- "label": "Display Options"
- },
- {
- "type": "list-strict",
- "key": "background",
- "label": "Background Color: ",
- "object_types": [
- {
- "label": "Red",
- "type": "number",
- "minimum": 0,
- "maximum": 1,
- "decimal": 3
- }, {
- "label": "Green",
- "type": "number",
- "minimum": 0,
- "maximum": 1,
- "decimal": 3
- }, {
- "label": "Blue",
- "type": "number",
- "minimum": 0,
- "maximum": 1,
- "decimal": 3
- }
- ]
- }, {
+ {
+ "type": "splitter"
+ }
+ ]
+ },
+ {
+ "type": "dict",
+ "key": "Display Options",
+ "children": [
+ {
+ "type": "label",
+ "label": "Display Options"
+ },
+ {
+ "type": "list-strict",
+ "key": "background",
+ "label": "Background Color: ",
+ "object_types": [
+ {
+ "label": "Red",
+ "type": "number",
+ "minimum": 0,
+ "maximum": 1,
+ "decimal": 3
+ },
+ {
+ "label": "Green",
+ "type": "number",
+ "minimum": 0,
+ "maximum": 1,
+ "decimal": 3
+ },
+ {
+ "label": "Blue",
+ "type": "number",
+ "minimum": 0,
+ "maximum": 1,
+ "decimal": 3
+ }]
+ },
+ {
"type": "list-strict",
"key": "backgroundBottom",
"label": "Background Bottom: ",
"object_types": [
- {
- "label": "Red",
- "type": "number",
- "minimum": 0,
- "maximum": 1,
- "decimal": 3
- }, {
- "label": "Green",
- "type": "number",
- "minimum": 0,
- "maximum": 1,
- "decimal": 3
- }, {
- "label": "Blue",
- "type": "number",
- "minimum": 0,
- "maximum": 1,
- "decimal": 3
- }
- ]
- }, {
- "type": "list-strict",
- "key": "backgroundTop",
- "label": "Background Top: ",
- "object_types": [
- {
- "label": "Red",
- "type": "number",
- "minimum": 0,
- "maximum": 1,
- "decimal": 3
- }, {
- "label": "Green",
- "type": "number",
- "minimum": 0,
- "maximum": 1,
- "decimal": 3
- }, {
- "label": "Blue",
- "type": "number",
- "minimum": 0,
- "maximum": 1,
- "decimal": 3
- }
- ]
- }, {
- "type": "boolean",
- "key": "override_display",
- "label": "Override display options"
- }
- ]
- },
- {
- "type": "splitter"
- } ,
- {
- "type": "dict",
- "key": "Generic",
- "children": [
- {
- "type": "label",
- "label": "Generic"
- },
- {
- "type": "boolean",
- "key": "isolate_view",
- "label": " Isolate view"
- },{
- "type": "boolean",
- "key": "off_screen",
- "label": " Off Screen"
- }
- ]
- },{
- "type": "dict",
- "key": "IO",
- "children": [
- {
- "type": "label",
- "label": "IO"
- },
- {
- "type": "text",
- "key": "name",
- "label": "Name"
- },{
- "type": "boolean",
- "key": "open_finished",
- "label": "Open finished"
- },{
- "type": "boolean",
- "key": "raw_frame_numbers",
- "label": "Raw frame numbers"
- },{
- "type": "list",
- "key": "recent_playblasts",
- "label": "Recent Playblasts",
- "object_type": "text"
- },{
- "type": "boolean",
- "key": "save_file",
- "label": "Save file"
- }
- ]
- },{
- "type": "dict",
- "key": "PanZoom",
- "children": [
- {
- "type": "boolean",
- "key": "pan_zoom",
- "label": " Pan Zoom"
- }
- ]
- },
- {
- "type": "splitter"
- },{
- "type": "dict",
- "key": "Renderer",
- "children": [
+ {
+ "label": "Red",
+ "type": "number",
+ "minimum": 0,
+ "maximum": 1,
+ "decimal": 3
+ },
+ {
+ "label": "Green",
+ "type": "number",
+ "minimum": 0,
+ "maximum": 1,
+ "decimal": 3
+ },
+ {
+ "label": "Blue",
+ "type": "number",
+ "minimum": 0,
+ "maximum": 1,
+ "decimal": 3
+ }]
+ },
+ {
+ "type": "list-strict",
+ "key": "backgroundTop",
+ "label": "Background Top: ",
+ "object_types": [
+ {
+ "label": "Red",
+ "type": "number",
+ "minimum": 0,
+ "maximum": 1,
+ "decimal": 3
+ },
+ {
+ "label": "Green",
+ "type": "number",
+ "minimum": 0,
+ "maximum": 1,
+ "decimal": 3
+ },
+ {
+ "label": "Blue",
+ "type": "number",
+ "minimum": 0,
+ "maximum": 1,
+ "decimal": 3
+ }]
+ },
+ {
+ "type": "boolean",
+ "key": "override_display",
+ "label": "Override display options"
+ }]
+ },
+ {
+ "type": "splitter"
+ },
+ {
+ "type": "dict",
+ "key": "Generic",
+ "children": [
+ {
+ "type": "label",
+ "label": "Generic"
+ },
+ {
+ "type": "boolean",
+ "key": "isolate_view",
+ "label": " Isolate view"
+ },
+ {
+ "type": "boolean",
+ "key": "off_screen",
+ "label": " Off Screen"
+ }]
+ },
+ {
+ "type": "dict",
+ "key": "IO",
+ "children": [
+ {
+ "type": "label",
+ "label": "IO"
+ },
+ {
+ "type": "text",
+ "key": "name",
+ "label": "Name"
+ },
+ {
+ "type": "boolean",
+ "key": "open_finished",
+ "label": "Open finished"
+ },
+ {
+ "type": "boolean",
+ "key": "raw_frame_numbers",
+ "label": "Raw frame numbers"
+ },
+ {
+ "type": "list",
+ "key": "recent_playblasts",
+ "label": "Recent Playblasts",
+ "object_type": "text"
+ },
+ {
+ "type": "boolean",
+ "key": "save_file",
+ "label": "Save file"
+ }]
+ },
+ {
+ "type": "dict",
+ "key": "PanZoom",
+ "children": [
+ {
+ "type": "boolean",
+ "key": "pan_zoom",
+ "label": " Pan Zoom"
+ }]
+ },
+ {
+ "type": "splitter"
+ },
+ {
+ "type": "dict",
+ "key": "Renderer",
+ "children": [
- {
- "type": "label",
- "label": "Renderer"
- },
- {
- "type": "text",
- "key": "rendererName",
- "label": " Renderer name"
- }
- ]
- },{
- "type": "dict",
- "key": "Resolution",
- "children": [
+ {
+ "type": "label",
+ "label": "Renderer"
+ },
+ {
+ "type": "text",
+ "key": "rendererName",
+ "label": " Renderer name"
+ }
+ ]
+ },
+ {
+ "type": "dict",
+ "key": "Resolution",
+ "children": [
- {
- "type": "splitter"
- },
- {
- "type": "label",
- "label": "Resolution"
- },
- {
- "type": "number",
- "key": "width",
- "label": " Width",
- "decimal": 0,
- "minimum": 0,
- "maximum": 99999
- },{
- "type": "number",
- "key": "height",
- "label": "Height",
- "decimal": 0,
- "minimum": 0,
- "maximum": 99999
- },{
- "type": "number",
- "key": "percent",
- "label": "percent",
- "decimal": 1,
- "minimum": 0,
- "maximum": 200
- },{
- "type": "text",
- "key": "mode",
- "label": "Mode"
- }
- ]
- },
- {
- "type": "splitter"
+ {
+ "type": "splitter"
+ },
+ {
+ "type": "label",
+ "label": "Resolution"
+ },
+ {
+ "type": "number",
+ "key": "width",
+ "label": " Width",
+ "decimal": 0,
+ "minimum": 0,
+ "maximum": 99999
+ },
+ {
+ "type": "number",
+ "key": "height",
+ "label": "Height",
+ "decimal": 0,
+ "minimum": 0,
+ "maximum": 99999
+ },
+ {
+ "type": "number",
+ "key": "percent",
+ "label": "percent",
+ "decimal": 1,
+ "minimum": 0,
+ "maximum": 200
+ },
+ {
+ "type": "text",
+ "key": "mode",
+ "label": "Mode"
+ }
+ ]
+ },
+ {
+ "type": "splitter"
+ },
+ {
+ "type": "dict",
+ "key": "Time Range",
+ "children": [
+ {
+ "type": "label",
+ "label": "Time Range"
+ },
+ {
+ "type": "number",
+ "key": "start_frame",
+ "label": " Start frame",
+ "decimal": 0,
+ "minimum": 0,
+ "maximum": 999999
+ },
+ {
+ "type": "number",
+ "key": "end_frame",
+ "label": "End frame",
+ "decimal": 0,
+ "minimum": 0,
+ "maximum": 999999
+ },
+ {
+ "type": "text",
+ "key": "frame",
+ "label": "Frame"
+ },
+ {
+ "type": "text",
+ "key": "time",
+ "label": "Time"
+ }]
+ },
+ {
+ "type": "dict",
+ "collapsable": true,
+ "key": "Viewport Options",
+ "label": "Viewport Options",
+ "children": [
+ {
+ "type": "boolean",
+ "key": "cameras",
+ "label": "cameras"
+ },
+ {
+ "type": "boolean",
+ "key": "clipGhosts",
+ "label": "clipGhosts"
+ },
+ {
+ "type": "boolean",
+ "key": "controlVertices",
+ "label": "controlVertices"
+ },
+ {
+ "type": "boolean",
+ "key": "deformers",
+ "label": "deformers"
+ },
+ {
+ "type": "boolean",
+ "key": "dimensions",
+ "label": "dimensions"
+ },
+ {
+ "type": "number",
+ "key": "displayLights",
+ "label": "displayLights",
+ "decimal": 0,
+ "minimum": 0,
+ "maximum": 10
+ },
+ {
+ "type": "boolean",
+ "key": "dynamicConstraints",
+ "label": "dynamicConstraints"
+ },
+ {
+ "type": "boolean",
+ "key": "dynamics",
+ "label": "dynamics"
+ },
+ {
+ "type": "boolean",
+ "key": "fluids",
+ "label": "fluids"
+ },
+ {
+ "type": "boolean",
+ "key": "follicles",
+ "label": "follicles"
+ },
+ {
+ "type": "boolean",
+ "key": "gpuCacheDisplayFilter",
+ "label": "gpuCacheDisplayFilter"
+ },
+ {
+ "type": "boolean",
+ "key": "greasePencils",
+ "label": "greasePencils"
+ },
+ {
+ "type": "boolean",
+ "key": "grid",
+ "label": "grid"
+ },
+ {
+ "type": "boolean",
+ "key": "hairSystems",
+ "label": "hairSystems"
+ },
+ {
+ "type": "boolean",
+ "key": "handles",
+ "label": "handles"
+ },
+ {
+ "type": "boolean",
+ "key": "high_quality",
+ "label": "high_quality"
+ },
+ {
+ "type": "boolean",
+ "key": "hud",
+ "label": "hud"
+ },
+ {
+ "type": "boolean",
+ "key": "hulls",
+ "label": "hulls"
+ },
+ {
+ "type": "boolean",
+ "key": "ikHandles",
+ "label": "ikHandles"
+ },
+ {
+ "type": "boolean",
+ "key": "imagePlane",
+ "label": "imagePlane"
+ },
+ {
+ "type": "boolean",
+ "key": "joints",
+ "label": "joints"
+ },
+ {
+ "type": "boolean",
+ "key": "lights",
+ "label": "lights"
+ },
+ {
+ "type": "boolean",
+ "key": "locators",
+ "label": "locators"
+ },
+ {
+ "type": "boolean",
+ "key": "manipulators",
+ "label": "manipulators"
+ },
+ {
+ "type": "boolean",
+ "key": "motionTrails",
+ "label": "motionTrails"
+ },
+ {
+ "type": "boolean",
+ "key": "nCloths",
+ "label": "nCloths"
+ },
+ {
+ "type": "boolean",
+ "key": "nParticles",
+ "label": "nParticles"
+ },
+ {
+ "type": "boolean",
+ "key": "nRigids",
+ "label": "nRigids"
+ },
+ {
+ "type": "boolean",
+ "key": "nurbsCurves",
+ "label": "nurbsCurves"
+ },
+ {
+ "type": "boolean",
+ "key": "nurbsSurfaces",
+ "label": "nurbsSurfaces"
+ },
+ {
+ "type": "boolean",
+ "key": "override_viewport_options",
+ "label": "override_viewport_options"
+ },
+ {
+ "type": "boolean",
+ "key": "particleInstancers",
+ "label": "particleInstancers"
+ },
+ {
+ "type": "boolean",
+ "key": "pivots",
+ "label": "pivots"
+ },
+ {
+ "type": "boolean",
+ "key": "planes",
+ "label": "planes"
+ },
+ {
+ "type": "boolean",
+ "key": "pluginShapes",
+ "label": "pluginShapes"
+ },
+ {
+ "type": "boolean",
+ "key": "polymeshes",
+ "label": "polymeshes"
+ },
+ {
+ "type": "boolean",
+ "key": "shadows",
+ "label": "shadows"
+ },
+ {
+ "type": "boolean",
+ "key": "strokes",
+ "label": "strokes"
+ },
+ {
+ "type": "boolean",
+ "key": "subdivSurfaces",
+ "label": "subdivSurfaces"
+ },
+ {
+ "type": "boolean",
+ "key": "textures",
+ "label": "textures"
+ },
+ {
+ "type": "boolean",
+ "key": "twoSidedLighting",
+ "label": "twoSidedLighting"
+ }]
+ },
+ {
+ "type": "dict",
+ "collapsable": true,
+ "key": "Camera Options",
+ "label": "Camera Options",
+ "children": [
+ {
+ "type": "boolean",
+ "key": "displayGateMask",
+ "label": "displayGateMask"
+ },
+ {
+ "type": "boolean",
+ "key": "displayResolution",
+ "label": "displayResolution"
+ },
+ {
+ "type": "boolean",
+ "key": "displayFilmGate",
+ "label": "displayFilmGate"
+ },
+ {
+ "type": "boolean",
+ "key": "displayFieldChart",
+ "label": "displayFieldChart"
+ },
+ {
+ "type": "boolean",
+ "key": "displaySafeAction",
+ "label": "displaySafeAction"
+ },
+ {
+ "type": "boolean",
+ "key": "displaySafeTitle",
+ "label": "displaySafeTitle"
+ },
+ {
+ "type": "boolean",
+ "key": "displayFilmPivot",
+ "label": "displayFilmPivot"
+ },
+ {
+ "type": "boolean",
+ "key": "displayFilmOrigin",
+ "label": "displayFilmOrigin"
+ },
+ {
+ "type": "number",
+ "key": "overscan",
+ "label": "overscan",
+ "decimal": 1,
+ "minimum": 0,
+ "maximum": 10
+ }]
+ }]
},
{
- "type": "dict",
- "key": "Time Range",
- "children": [
- {
- "type": "label",
- "label": "Time Range"
- },
- {
- "type": "number",
- "key": "start_frame",
- "label": " Start frame",
- "decimal": 0,
- "minimum": 0,
- "maximum": 999999
- },{
- "type": "number",
- "key": "end_frame",
- "label": "End frame",
- "decimal": 0,
- "minimum": 0,
- "maximum": 999999
- },{
- "type": "text",
- "key": "frame",
- "label": "Frame"
- },{
- "type": "text",
- "key": "time",
- "label": "Time"
+ "type": "dict-modifiable",
+ "key": "ext_mapping",
+ "label": "Extension Mapping",
+ "object_type":{
+ "type": "text"
}
- ]
- },{
- "type": "dict",
- "collapsable": true,
- "key": "Viewport Options",
- "label": "Viewport Options",
- "children": [
- {
- "type": "boolean",
- "key": "cameras",
- "label": "cameras"
- },{
- "type": "boolean",
- "key": "clipGhosts",
- "label": "clipGhosts"
- },{
- "type": "boolean",
- "key": "controlVertices",
- "label": "controlVertices"
- },{
- "type": "boolean",
- "key": "deformers",
- "label": "deformers"
- },{
- "type": "boolean",
- "key": "dimensions",
- "label": "dimensions"
- },{
- "type": "number",
- "key": "displayLights",
- "label": "displayLights",
- "decimal": 0,
- "minimum": 0,
- "maximum": 10
- },{
- "type": "boolean",
- "key": "dynamicConstraints",
- "label": "dynamicConstraints"
- },{
- "type": "boolean",
- "key": "dynamics",
- "label": "dynamics"
- },{
- "type": "boolean",
- "key": "fluids",
- "label": "fluids"
- },{
- "type": "boolean",
- "key": "follicles",
- "label": "follicles"
- },{
- "type": "boolean",
- "key": "gpuCacheDisplayFilter",
- "label": "gpuCacheDisplayFilter"
- },{
- "type": "boolean",
- "key": "greasePencils",
- "label": "greasePencils"
- },{
- "type": "boolean",
- "key": "grid",
- "label": "grid"
- },{
- "type": "boolean",
- "key": "hairSystems",
- "label": "hairSystems"
- },{
- "type": "boolean",
- "key": "handles",
- "label": "handles"
- },{
- "type": "boolean",
- "key": "high_quality",
- "label": "high_quality"
- },{
- "type": "boolean",
- "key": "hud",
- "label": "hud"
- },{
- "type": "boolean",
- "key": "hulls",
- "label": "hulls"
- },{
- "type": "boolean",
- "key": "ikHandles",
- "label": "ikHandles"
- },{
- "type": "boolean",
- "key": "imagePlane",
- "label": "imagePlane"
- },{
- "type": "boolean",
- "key": "joints",
- "label": "joints"
- },{
- "type": "boolean",
- "key": "lights",
- "label": "lights"
- },{
- "type": "boolean",
- "key": "locators",
- "label": "locators"
- },{
- "type": "boolean",
- "key": "manipulators",
- "label": "manipulators"
- },{
- "type": "boolean",
- "key": "motionTrails",
- "label": "motionTrails"
- },{
- "type": "boolean",
- "key": "nCloths",
- "label": "nCloths"
- },{
- "type": "boolean",
- "key": "nParticles",
- "label": "nParticles"
- },{
- "type": "boolean",
- "key": "nRigids",
- "label": "nRigids"
- },{
- "type": "boolean",
- "key": "nurbsCurves",
- "label": "nurbsCurves"
- },{
- "type": "boolean",
- "key": "nurbsSurfaces",
- "label": "nurbsSurfaces"
- },{
- "type": "boolean",
- "key": "override_viewport_options",
- "label": "override_viewport_options"
- },{
- "type": "boolean",
- "key": "particleInstancers",
- "label": "particleInstancers"
- },{
- "type": "boolean",
- "key": "pivots",
- "label": "pivots"
- },{
- "type": "boolean",
- "key": "planes",
- "label": "planes"
- },{
- "type": "boolean",
- "key": "pluginShapes",
- "label": "pluginShapes"
- },{
- "type": "boolean",
- "key": "polymeshes",
- "label": "polymeshes"
- },{
- "type": "boolean",
- "key": "shadows",
- "label": "shadows"
- },{
- "type": "boolean",
- "key": "strokes",
- "label": "strokes"
- },{
- "type": "boolean",
- "key": "subdivSurfaces",
- "label": "subdivSurfaces"
- },{
- "type": "boolean",
- "key": "textures",
- "label": "textures"
- },{
- "type": "boolean",
- "key": "twoSidedLighting",
- "label": "twoSidedLighting"
- }
- ]
- },{
- "type": "dict",
- "collapsable": true,
- "key": "Camera Options",
- "label": "Camera Options",
- "children": [
- {
- "type": "boolean",
- "key": "displayGateMask",
- "label": "displayGateMask"
- },{
- "type": "boolean",
- "key": "displayResolution",
- "label": "displayResolution"
- },{
- "type": "boolean",
- "key": "displayFilmGate",
- "label": "displayFilmGate"
- },{
- "type": "boolean",
- "key": "displayFieldChart",
- "label": "displayFieldChart"
- },{
- "type": "boolean",
- "key": "displaySafeAction",
- "label": "displaySafeAction"
- },{
- "type": "boolean",
- "key": "displaySafeTitle",
- "label": "displaySafeTitle"
- },{
- "type": "boolean",
- "key": "displayFilmPivot",
- "label": "displayFilmPivot"
- },{
- "type": "boolean",
- "key": "displayFilmOrigin",
- "label": "displayFilmOrigin"
- },{
- "type": "number",
- "key": "overscan",
- "label": "overscan",
- "decimal": 1,
- "minimum": 0,
- "maximum": 10
- }
- ]
}
]
}
diff --git a/pype/tools/settings/settings/gui_schemas/projects_schema/schemas/schema_maya_publish.json b/pype/tools/settings/settings/gui_schemas/projects_schema/schemas/schema_maya_publish.json
index 1cd526adb9..e5d66045d4 100644
--- a/pype/tools/settings/settings/gui_schemas/projects_schema/schemas/schema_maya_publish.json
+++ b/pype/tools/settings/settings/gui_schemas/projects_schema/schemas/schema_maya_publish.json
@@ -134,7 +134,13 @@
"type": "boolean",
"key": "enabled",
"label": "Enabled"
- }]
+ },
+ {
+ "type": "raw-json",
+ "key": "attributes",
+ "label": "Attributes"
+ }
+ ]
},
{
"type": "splitter"