diff --git a/openpype/hosts/maya/plugins/load/load_ass.py b/openpype/hosts/maya/plugins/load/load_ass.py index b4bbd93f99..dcd5644699 100644 --- a/openpype/hosts/maya/plugins/load/load_ass.py +++ b/openpype/hosts/maya/plugins/load/load_ass.py @@ -81,7 +81,10 @@ class AssProxyLoader(openpype.hosts.maya.api.plugin.ReferenceLoader): if c is not None: cmds.setAttr(groupName + ".useOutlinerColor", 1) cmds.setAttr(groupName + ".outlinerColor", - c[0], c[1], c[2]) + (float(c[0])/256), + (float(c[1])/256), + (float(c[2])/256) + ) self[:] = nodes diff --git a/openpype/hosts/maya/plugins/load/load_gpucache.py b/openpype/hosts/maya/plugins/load/load_gpucache.py index 5b1b29e184..7c06bba002 100644 --- a/openpype/hosts/maya/plugins/load/load_gpucache.py +++ b/openpype/hosts/maya/plugins/load/load_gpucache.py @@ -38,7 +38,10 @@ class GpuCacheLoader(api.Loader): if c is not None: cmds.setAttr(root + ".useOutlinerColor", 1) cmds.setAttr(root + ".outlinerColor", - c[0], c[1], c[2]) + (float(c[0])/256), + (float(c[1])/256), + (float(c[2])/256) + ) # Create transform with shape transform_name = label + "_GPU" diff --git a/openpype/hosts/maya/plugins/load/load_reference.py b/openpype/hosts/maya/plugins/load/load_reference.py index 37a2b145d4..6a017ec393 100644 --- a/openpype/hosts/maya/plugins/load/load_reference.py +++ b/openpype/hosts/maya/plugins/load/load_reference.py @@ -85,7 +85,11 @@ class ReferenceLoader(openpype.hosts.maya.api.plugin.ReferenceLoader): c = colors.get(family) if c is not None: groupNode.useOutlinerColor.set(1) - groupNode.outlinerColor.set(c[0], c[1], c[2]) + groupNode.outlinerColor.set( + (float(c[0])/256), + (float(c[1])/256), + (float(c[2])/256) + ) self[:] = newNodes diff --git a/openpype/hosts/maya/plugins/load/load_vdb_to_redshift.py b/openpype/hosts/maya/plugins/load/load_vdb_to_redshift.py index b705b55f4d..8f5f4a433c 100644 --- a/openpype/hosts/maya/plugins/load/load_vdb_to_redshift.py +++ b/openpype/hosts/maya/plugins/load/load_vdb_to_redshift.py @@ -62,7 +62,10 @@ class LoadVDBtoRedShift(api.Loader): if c is not None: cmds.setAttr(root + ".useOutlinerColor", 1) cmds.setAttr(root + ".outlinerColor", - c[0], c[1], c[2]) + (float(c[0])/256), + (float(c[1])/256), + (float(c[2])/256) + ) # Create VR volume_node = cmds.createNode("RedshiftVolumeShape", diff --git a/openpype/hosts/maya/plugins/load/load_vdb_to_vray.py b/openpype/hosts/maya/plugins/load/load_vdb_to_vray.py index 82ccdb481b..c170ca906c 100644 --- a/openpype/hosts/maya/plugins/load/load_vdb_to_vray.py +++ b/openpype/hosts/maya/plugins/load/load_vdb_to_vray.py @@ -55,7 +55,10 @@ class LoadVDBtoVRay(api.Loader): if c is not None: cmds.setAttr(root + ".useOutlinerColor", 1) cmds.setAttr(root + ".outlinerColor", - c[0], c[1], c[2]) + (float(c[0])/256), + (float(c[1])/256), + (float(c[2])/256) + ) # Create VR grid_node = cmds.createNode("VRayVolumeGrid", diff --git a/openpype/hosts/maya/plugins/load/load_vrayproxy.py b/openpype/hosts/maya/plugins/load/load_vrayproxy.py index d5d4a941e3..d214d6136d 100644 --- a/openpype/hosts/maya/plugins/load/load_vrayproxy.py +++ b/openpype/hosts/maya/plugins/load/load_vrayproxy.py @@ -74,7 +74,10 @@ class VRayProxyLoader(api.Loader): if c is not None: cmds.setAttr("{0}.useOutlinerColor".format(group_node), 1) cmds.setAttr("{0}.outlinerColor".format(group_node), - c[0], c[1], c[2]) + (float(c[0])/256), + (float(c[1])/256), + (float(c[2])/256) + ) return containerise( name=name, diff --git a/openpype/hosts/maya/plugins/load/load_vrayscene.py b/openpype/hosts/maya/plugins/load/load_vrayscene.py index b0f0c2a54b..a668a7c63a 100644 --- a/openpype/hosts/maya/plugins/load/load_vrayscene.py +++ b/openpype/hosts/maya/plugins/load/load_vrayscene.py @@ -53,7 +53,10 @@ class VRaySceneLoader(api.Loader): if c is not None: cmds.setAttr("{0}.useOutlinerColor".format(group_node), 1) cmds.setAttr("{0}.outlinerColor".format(group_node), - c[0], c[1], c[2]) + (float(c[0])/256), + (float(c[1])/256), + (float(c[2])/256) + ) return containerise( name=name, diff --git a/openpype/hosts/maya/plugins/load/load_yeti_cache.py b/openpype/hosts/maya/plugins/load/load_yeti_cache.py index 43c8aa16a0..881344cc66 100644 --- a/openpype/hosts/maya/plugins/load/load_yeti_cache.py +++ b/openpype/hosts/maya/plugins/load/load_yeti_cache.py @@ -66,7 +66,10 @@ class YetiCacheLoader(api.Loader): if c is not None: cmds.setAttr(group_name + ".useOutlinerColor", 1) cmds.setAttr(group_name + ".outlinerColor", - c[0], c[1], c[2]) + (float(c[0])/256), + (float(c[1])/256), + (float(c[2])/256) + ) nodes.append(group_node) diff --git a/openpype/hosts/maya/plugins/load/load_yeti_rig.py b/openpype/hosts/maya/plugins/load/load_yeti_rig.py index a329be4cf5..8234ace711 100644 --- a/openpype/hosts/maya/plugins/load/load_yeti_rig.py +++ b/openpype/hosts/maya/plugins/load/load_yeti_rig.py @@ -84,7 +84,10 @@ class YetiRigLoader(openpype.hosts.maya.api.plugin.ReferenceLoader): if c is not None: cmds.setAttr(groupName + ".useOutlinerColor", 1) cmds.setAttr(groupName + ".outlinerColor", - c[0], c[1], c[2]) + (float(c[0])/256), + (float(c[1])/256), + (float(c[2])/256) + ) self[:] = nodes return nodes diff --git a/openpype/settings/defaults/project_settings/aftereffects.json b/openpype/settings/defaults/project_settings/aftereffects.json index f54dbb9612..b272c60d98 100644 --- a/openpype/settings/defaults/project_settings/aftereffects.json +++ b/openpype/settings/defaults/project_settings/aftereffects.json @@ -4,8 +4,12 @@ "enabled": true, "optional": true, "active": true, - "skip_resolution_check": [".*"], - "skip_timelines_check": [".*"] + "skip_resolution_check": [ + ".*" + ], + "skip_timelines_check": [ + ".*" + ] }, "AfterEffectsSubmitDeadline": { "use_published": true, diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json index b7498209ca..5f779fccfa 100644 --- a/openpype/settings/defaults/project_settings/global.json +++ b/openpype/settings/defaults/project_settings/global.json @@ -273,8 +273,7 @@ "active_site": "studio", "remote_site": "studio" }, - "sites": { - } + "sites": {} }, "project_plugins": { "windows": [], diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index 779b8bb3f3..a665c8a13f 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -393,74 +393,88 @@ "load": { "colors": { "model": [ - 0.821, - 0.518, - 0.117 + 209, + 132, + 30, + 255 ], "rig": [ - 0.144, - 0.443, - 0.463 + 59, + 226, + 235, + 255 ], "pointcache": [ - 0.368, - 0.821, - 0.117 + 94, + 209, + 30, + 255 ], "animation": [ - 0.368, - 0.821, - 0.117 + 94, + 209, + 30, + 255 ], "ass": [ - 1.0, - 0.332, - 0.312 + 249, + 135, + 53, + 255 ], "camera": [ - 0.447, - 0.312, - 1.0 + 136, + 114, + 244, + 255 ], "fbx": [ - 1.0, - 0.931, - 0.312 + 215, + 166, + 255, + 255 ], "mayaAscii": [ - 0.312, - 1.0, - 0.747 + 67, + 174, + 255, + 255 ], "setdress": [ - 0.312, - 1.0, - 0.747 + 255, + 250, + 90, + 255 ], "layout": [ - 0.312, - 1.0, - 0.747 + 255, + 250, + 90, + 255 ], "vdbcache": [ - 0.312, - 1.0, - 0.428 + 249, + 54, + 0, + 255 ], "vrayproxy": [ - 0.258, - 0.95, - 0.541 + 255, + 150, + 12, + 255 ], "yeticache": [ - 0.2, - 0.8, - 0.3 + 99, + 206, + 220, + 255 ], "yetiRig": [ - 0.0, - 0.8, - 0.5 + 0, + 205, + 125, + 255 ] } }, diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_load.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_load.json index e14ca3413d..0b09d08700 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_load.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_load.json @@ -11,66 +11,74 @@ "label": "Loaded Subsets Outliner Colors", "children": [ { - "type": "schema_template", - "name": "template_color", - "template_data": [ - { - "label": "Model:", - "name": "model" - }, - { - "label": "Rig:", - "name": "rig" - }, - { - "label": "Pointcache:", - "name": "pointcache" - }, - { - "label": "Animation:", - "name": "animation" - }, - { - "label": "Arnold Standin:", - "name": "ass" - }, - { - "label": "Camera:", - "name": "camera" - }, - { - "label": "FBX:", - "name": "fbx" - }, - { - "label": "Maya Scene:", - "name": "mayaAscii" - }, - { - "label": "Set Dress:", - "name": "setdress" - }, - { - "label": "Layout:", - "name": "layout" - }, - { - "label": "VDB Cache:", - "name": "vdbcache" - }, - { - "label": "Vray Proxy:", - "name": "vrayproxy" - }, - { - "label": "Yeti Cache:", - "name": "yeticache" - }, - { - "label": "Yeti Rig:", - "name": "yetiRig" - } - ] + "type": "color", + "label": "Model:", + "key": "model" + }, + { + "type": "color", + "label": "Rig:", + "key": "rig" + }, + { + "type": "color", + "label": "Pointcache:", + "key": "pointcache" + }, + { + "type": "color", + "label": "Animation:", + "key": "animation" + }, + { + "type": "color", + "label": "Arnold Standin:", + "key": "ass" + }, + { + "type": "color", + "label": "Camera:", + "key": "camera" + }, + { + "type": "color", + "label": "FBX:", + "key": "fbx" + }, + { + "type": "color", + "label": "Maya Scene:", + "key": "mayaAscii" + }, + { + "type": "color", + "label": "Set Dress:", + "key": "setdress" + }, + { + "type": "color", + "label": "Layout:", + "key": "layout" + }, + { + "type": "color", + "label": "VDB Cache:", + "key": "vdbcache" + }, + { + "type": "color", + "label": "Vray Proxy:", + "key": "vrayproxy" + }, + { + "type": "color", + "label": "Yeti Cache:", + "key": "yeticache" + }, + { + "type": "color", + "label": "Yeti Rig:", + "key": "yetiRig" } ] }