Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Maya: Change mayaAscii family to mayaScene #2106

Merged
merged 6 commits into from
Oct 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions openpype/hosts/maya/plugins/create/create_mayaascii.py
Original file line number Diff line number Diff line change
@@ -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']
3 changes: 2 additions & 1 deletion openpype/hosts/maya/plugins/load/load_reference.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class ReferenceLoader(openpype.hosts.maya.api.plugin.ReferenceLoader):
"pointcache",
"animation",
"mayaAscii",
"mayaScene",
"setdress",
"layout",
"camera",
Expand Down Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class ExtractMayaSceneRaw(openpype.api.Extractor):
label = "Maya Scene (Raw)"
hosts = ["maya"]
families = ["mayaAscii",
"mayaScene",
"setdress",
"layout",
"camerarig",
Expand Down
1 change: 1 addition & 0 deletions openpype/plugins/publish/collect_resources_path.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class CollectResourcesPath(pyblish.api.InstancePlugin):
"animation",
"model",
"mayaAscii",
"mayaScene",
"setdress",
"layout",
"ass",
Expand Down
1 change: 1 addition & 0 deletions openpype/plugins/publish/integrate_new.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
"animation",
"model",
"mayaAscii",
"mayaScene",
"setdress",
"layout",
"ass",
Expand Down
2 changes: 1 addition & 1 deletion openpype/settings/defaults/project_settings/global.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"animation",
"setdress",
"layout",
"mayaAscii"
"mayaScene"
]
},
"ExtractJpegEXR": {
Expand Down
6 changes: 6 additions & 0 deletions openpype/settings/defaults/project_settings/maya.json
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,12 @@
255,
255
],
"mayaScene": [
67,
174,
255,
255
],
"setdress": [
255,
250,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:",
Expand Down
1 change: 1 addition & 0 deletions website/docs/pype2/admin_presets_plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down