Merge branch 'develop' of github.com:pypeclub/pype into feature/webpublisher_backend

openpype/settings/defaults/project_settings/global.json

@@ -1,5 +1,13 @@
 {
     "publish": {
+        "ValidateEditorialAssetName": {
+            "enabled": true,
+            "optional": false
+        },
+        "ValidateVersion": {
+            "enabled": true,
+            "optional": false
+        },
         "IntegrateHeroVersion": {
             "enabled": true,
             "optional": true,

openpype/settings/defaults/project_settings/maya.json

@@ -7,6 +7,22 @@
         "workfile": "ma",
         "yetiRig": "ma"
     },
+    "scriptsmenu": {
+        "name": "OpenPype Tools",
+        "definition": [
+            {
+                "type": "action",
+                "command": "import openpype.hosts.maya.api.commands as op_cmds; op_cmds.edit_shader_definitions()",
+                "sourcetype": "python",
+                "title": "Edit shader name definitions",
+                "tooltip": "Edit shader name definitions used in validation and renaming.",
+                "tags": [
+                    "pipeline",
+                    "shader"
+                ]
+            }
+        ]
+    },
     "create": {
         "CreateLook": {
             "enabled": true,
@@ -148,12 +164,14 @@
         },
         "ValidateModelName": {
             "enabled": false,
+            "database": true,
             "material_file": {
                 "windows": "",
                 "darwin": "",
                 "linux": ""
             },
-            "regex": "(.*)_(\\\\d)*_(.*)_(GEO)"
+            "regex": "(.*)_(\\d)*_(?P<shader>.*)_(GEO)",
+            "top_level_regex": ".*_GRP"
         },
         "ValidateTransformNamingSuffix": {
             "enabled": true,

openpype/settings/defaults/project_settings/standalonepublisher.json

@@ -254,7 +254,7 @@
             },
             "shot_add_tasks": {}
         },
-        "shot_add_tasks": {
+        "CollectInstances": {
             "custom_start_frame": 0,
             "timeline_frame_start": 900000,
             "timeline_frame_offset": 0,