Merge pull request #2106 from pypeclub/Change-mayaAscii-family-to-may…

…aScene
ynput · Oct 6, 2021 · fadab4e · fadab4e
2 parents cf6eaca + 81c6987
commit fadab4e
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 12 deletions.
diff --git a/openpype/hosts/maya/plugins/create/create_mayaascii.py b/openpype/hosts/maya/plugins/create/create_mayaascii.py
@@ -1,11 +1,11 @@
 from openpype.hosts.maya.api import plugin
 
 
-class CreateMayaAscii(plugin.Creator):
- """Raw Maya Ascii file export"""
+class CreateMayaScene(plugin.Creator):
+ """Raw Maya Scene file export"""
 
- name = "mayaAscii"
- label = "Maya Ascii"
- family = "mayaAscii"
+ name = "mayaScene"
+ label = "Maya Scene"
+ family = "mayaScene"
  icon = "file-archive-o"
  defaults = ['Main']
diff --git a/openpype/hosts/maya/plugins/load/load_reference.py b/openpype/hosts/maya/plugins/load/load_reference.py
@@ -13,6 +13,7 @@ class ReferenceLoader(openpype.hosts.maya.api.plugin.ReferenceLoader):
  "pointcache",
  "animation",
  "mayaAscii",
+ "mayaScene",
  "setdress",
  "layout",
  "camera",
@@ -71,7 +72,7 @@ def process_reference(self, context, name, namespace, options):
  except: # noqa: E722
  pass
 
- if family not in ["layout", "setdress", "mayaAscii"]:
+ if family not in ["layout", "setdress", "mayaAscii", "mayaScene"]:
  for root in roots:
  root.setParent(world=True)
 

diff --git a/...maya/plugins/publish/collect_mayaascii.py → ...aya/plugins/publish/collect_maya_scene.py b/...maya/plugins/publish/collect_mayaascii.py → ...aya/plugins/publish/collect_maya_scene.py
@@ -3,14 +3,14 @@
 import pyblish.api
 
 
-class CollectMayaAscii(pyblish.api.InstancePlugin):
- """Collect May Ascii Data
+class CollectMayaScene(pyblish.api.InstancePlugin):
+ """Collect Maya Scene Data
 
  """
 
  order = pyblish.api.CollectorOrder + 0.2
  label = 'Collect Model Data'
- families = ["mayaAscii"]
+ families = ["mayaScene"]
 
  def process(self, instance):
  # Extract only current frame (override)

diff --git a/...sts/maya/plugins/publish/collect_scene.py → .../maya/plugins/publish/collect_workfile.py b/...sts/maya/plugins/publish/collect_scene.py → .../maya/plugins/publish/collect_workfile.py
@@ -4,7 +4,7 @@
 from maya import cmds
 
 
-class CollectMayaScene(pyblish.api.ContextPlugin):
+class CollectWorkfile(pyblish.api.ContextPlugin):
  """Inject the current working file into context"""
 
  order = pyblish.api.CollectorOrder - 0.01

diff --git a/openpype/hosts/maya/plugins/publish/extract_maya_scene_raw.py b/openpype/hosts/maya/plugins/publish/extract_maya_scene_raw.py
@@ -17,6 +17,7 @@ class ExtractMayaSceneRaw(openpype.api.Extractor):
  label = "Maya Scene (Raw)"
  hosts = ["maya"]
  families = ["mayaAscii",
+ "mayaScene",
  "setdress",
  "layout",
  "camerarig",

diff --git a/openpype/plugins/publish/collect_resources_path.py b/openpype/plugins/publish/collect_resources_path.py
@@ -26,6 +26,7 @@ class CollectResourcesPath(pyblish.api.InstancePlugin):
  "animation",
  "model",
  "mayaAscii",
+ "mayaScene",
  "setdress",
  "layout",
  "ass",

diff --git a/openpype/plugins/publish/integrate_new.py b/openpype/plugins/publish/integrate_new.py
@@ -63,6 +63,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
  "animation",
  "model",
  "mayaAscii",
+ "mayaScene",
  "setdress",
  "layout",
  "ass",

diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json
@@ -24,7 +24,7 @@
  "animation",
  "setdress",
  "layout",
- "mayaAscii"
+ "mayaScene"
  ]
  },
  "ExtractJpegEXR": {

diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
@@ -489,6 +489,12 @@
  255,
  255
  ],
+ "mayaScene": [
+ 67,
+ 174,
+ 255,
+ 255
+ ],
  "setdress": [
  255,
  250,

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
@@ -47,9 +47,14 @@
  },
  {
  "type": "color",
- "label": "Maya Scene:",
+ "label": "Maya Ascii:",
  "key": "mayaAscii"
  },
+ {
+ "type": "color",
+ "label": "Maya Scene:",
+ "key": "mayaScene"
+ },
  {
  "type": "color",
  "label": "Set Dress:",

diff --git a/website/docs/pype2/admin_presets_plugins.md b/website/docs/pype2/admin_presets_plugins.md
@@ -469,6 +469,7 @@ maya outliner colours for various families
  "camera": [0.447, 0.312, 1.0],
  "fbx": [1.0, 0.931, 0.312],
  "mayaAscii": [0.312, 1.0, 0.747],
+ "mayaScene": [0.312, 1.0, 0.747],
  "setdress": [0.312, 1.0, 0.747],
  "layout": [0.312, 1.0, 0.747],
  "vdbcache": [0.312, 1.0, 0.428],