Merge branch 'develop' into feature/OP-1566_Flame-Create-Batch-Group

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## [3.9.2-nightly.2](https://github.com/pypeclub/OpenPype/tree/HEAD)
+## [3.9.2-nightly.3](https://github.com/pypeclub/OpenPype/tree/HEAD)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.9.1...HEAD)
 
@@ -8,11 +8,16 @@
 
 - Docs: Added MongoDB requirements [\#2951](https://github.com/pypeclub/OpenPype/pull/2951)
 
+**🆕 New features**
+
+- Multiverse: First PR [\#2908](https://github.com/pypeclub/OpenPype/pull/2908)
+
 **🚀 Enhancements**
 
 - Slack: Added configurable maximum file size of review upload to Slack [\#2945](https://github.com/pypeclub/OpenPype/pull/2945)
 - NewPublisher: Prepared implementation of optional pyblish plugin [\#2943](https://github.com/pypeclub/OpenPype/pull/2943)
 - Workfiles: Open published workfiles [\#2925](https://github.com/pypeclub/OpenPype/pull/2925)
+- General: Default modules loaded dynamically [\#2923](https://github.com/pypeclub/OpenPype/pull/2923)
 - CI: change the version bump logic [\#2919](https://github.com/pypeclub/OpenPype/pull/2919)
 - Deadline: Add headless argument [\#2916](https://github.com/pypeclub/OpenPype/pull/2916)
 - Nuke: Add no-audio Tag [\#2911](https://github.com/pypeclub/OpenPype/pull/2911)
@@ -22,16 +27,21 @@
 
 **🐛 Bug fixes**
 
+- Slack: Added default for review\_upload\_limit for Slack [\#2965](https://github.com/pypeclub/OpenPype/pull/2965)
+- Settings: Conditional dictionary avoid invalid logs [\#2956](https://github.com/pypeclub/OpenPype/pull/2956)
 - LogViewer: Don't refresh on initialization [\#2949](https://github.com/pypeclub/OpenPype/pull/2949)
+- nuke: python3 compatibility issue with `iteritems` [\#2948](https://github.com/pypeclub/OpenPype/pull/2948)
 - General: anatomy data with correct task short key [\#2947](https://github.com/pypeclub/OpenPype/pull/2947)
 - SceneInventory: Fix imports in UI [\#2944](https://github.com/pypeclub/OpenPype/pull/2944)
 - Slack: add generic exception [\#2941](https://github.com/pypeclub/OpenPype/pull/2941)
 - General: Python specific vendor paths on env injection [\#2939](https://github.com/pypeclub/OpenPype/pull/2939)
 - General: More fail safe delete old versions [\#2936](https://github.com/pypeclub/OpenPype/pull/2936)
 - Settings UI: Collapsed of collapsible wrapper works as expected [\#2934](https://github.com/pypeclub/OpenPype/pull/2934)
+- Maya: Do not pass `set` to maya commands \(fixes support for older maya versions\) [\#2932](https://github.com/pypeclub/OpenPype/pull/2932)
 - General: Don't print log record on OSError [\#2926](https://github.com/pypeclub/OpenPype/pull/2926)
 - Hiero: Fix import of 'register\_event\_callback' [\#2924](https://github.com/pypeclub/OpenPype/pull/2924)
 - Ftrack: Missing Ftrack id after editorial publish [\#2905](https://github.com/pypeclub/OpenPype/pull/2905)
+- AfterEffects: Fix rendering for single frame in DL [\#2875](https://github.com/pypeclub/OpenPype/pull/2875)
 
 **🔀 Refactored code**
 
@@ -43,7 +53,7 @@
 
 **Merged pull requests:**
 
-- Maya: Do not pass `set` to maya commands \(fixes support for older maya versions\) [\#2932](https://github.com/pypeclub/OpenPype/pull/2932)
+- Maya - added transparency into review creator [\#2952](https://github.com/pypeclub/OpenPype/pull/2952)
 
 ## [3.9.1](https://github.com/pypeclub/OpenPype/tree/3.9.1) (2022-03-18)
 
@@ -96,14 +106,10 @@
 - Maya: add loaded containers to published instance [\#2837](https://github.com/pypeclub/OpenPype/pull/2837)
 - Ftrack: Can sync fps as string [\#2836](https://github.com/pypeclub/OpenPype/pull/2836)
 - General: Custom function for find executable [\#2822](https://github.com/pypeclub/OpenPype/pull/2822)
-- General: Color dialog UI fixes [\#2817](https://github.com/pypeclub/OpenPype/pull/2817)
-- global: letter box calculated on output as last process [\#2812](https://github.com/pypeclub/OpenPype/pull/2812)
-- Nuke: adding Reformat to baking mov plugin  [\#2811](https://github.com/pypeclub/OpenPype/pull/2811)
 
 **🐛 Bug fixes**
 
 - General: Missing time function [\#2877](https://github.com/pypeclub/OpenPype/pull/2877)
-- AfterEffects: Fix rendering for single frame in DL [\#2875](https://github.com/pypeclub/OpenPype/pull/2875)
 - Deadline: Fix plugin name for tile assemble [\#2868](https://github.com/pypeclub/OpenPype/pull/2868)
 - Nuke: gizmo precollect fix [\#2866](https://github.com/pypeclub/OpenPype/pull/2866)
 - General: Fix hardlink for windows [\#2864](https://github.com/pypeclub/OpenPype/pull/2864)
@@ -126,7 +132,6 @@
 - Settings UI: Fix "Apply from" action [\#2820](https://github.com/pypeclub/OpenPype/pull/2820)
 - Ftrack: Job killer with missing user [\#2819](https://github.com/pypeclub/OpenPype/pull/2819)
 - Nuke: Use AVALON\_APP to get value for "app" key [\#2818](https://github.com/pypeclub/OpenPype/pull/2818)
-- StandalonePublisher: use dynamic groups in subset names [\#2816](https://github.com/pypeclub/OpenPype/pull/2816)
 
 **🔀 Refactored code**
 

openpype/hosts/maya/plugins/create/create_multiverse_usd.py

@@ -0,0 +1,51 @@
+from openpype.hosts.maya.api import plugin, lib
+
+
+class CreateMultiverseUsd(plugin.Creator):
+    """Multiverse USD data"""
+
+    name = "usdMain"
+    label = "Multiverse USD"
+    family = "usd"
+    icon = "cubes"
+
+    def __init__(self, *args, **kwargs):
+        super(CreateMultiverseUsd, self).__init__(*args, **kwargs)
+
+        # Add animation data first, since it maintains order.
+        self.data.update(lib.collect_animation_data(True))
+
+        self.data["stripNamespaces"] = False
+        self.data["mergeTransformAndShape"] = False
+        self.data["writeAncestors"] = True
+        self.data["flattenParentXforms"] = False
+        self.data["writeSparseOverrides"] = False
+        self.data["useMetaPrimPath"] = False
+        self.data["customRootPath"] = ''
+        self.data["customAttributes"] = ''
+        self.data["nodeTypesToIgnore"] = ''
+        self.data["writeMeshes"] = True
+        self.data["writeCurves"] = True
+        self.data["writeParticles"] = True
+        self.data["writeCameras"] = False
+        self.data["writeLights"] = False
+        self.data["writeJoints"] = False
+        self.data["writeCollections"] = False
+        self.data["writePositions"] = True
+        self.data["writeNormals"] = True
+        self.data["writeUVs"] = True
+        self.data["writeColorSets"] = False
+        self.data["writeTangents"] = False
+        self.data["writeRefPositions"] = False
+        self.data["writeBlendShapes"] = False
+        self.data["writeDisplayColor"] = False
+        self.data["writeSkinWeights"] = False
+        self.data["writeMaterialAssignment"] = False
+        self.data["writeHardwareShader"] = False
+        self.data["writeShadingNetworks"] = False
+        self.data["writeTransformMatrix"] = True
+        self.data["writeUsdAttributes"] = False
+        self.data["timeVaryingTopology"] = False
+        self.data["customMaterialNamespace"] = ''
+        self.data["numTimeSamples"] = 1
+        self.data["timeSamplesSpan"] = 0.0

openpype/hosts/maya/plugins/create/create_multiverse_usd_comp.py

@@ -0,0 +1,23 @@
+from openpype.hosts.maya.api import plugin, lib
+
+
+class CreateMultiverseUsdComp(plugin.Creator):
+    """Create Multiverse USD Composition"""
+
+    name = "usdCompositionMain"
+    label = "Multiverse USD Composition"
+    family = "usdComposition"
+    icon = "cubes"
+
+    def __init__(self, *args, **kwargs):
+        super(CreateMultiverseUsdComp, self).__init__(*args, **kwargs)
+
+        # Add animation data first, since it maintains order.
+        self.data.update(lib.collect_animation_data(True))
+
+        self.data["stripNamespaces"] = False
+        self.data["mergeTransformAndShape"] = False
+        self.data["flattenContent"] = False
+        self.data["writePendingOverrides"] = False
+        self.data["numTimeSamples"] = 1
+        self.data["timeSamplesSpan"] = 0.0

openpype/hosts/maya/plugins/create/create_multiverse_usd_over.py

@@ -0,0 +1,28 @@
+from openpype.hosts.maya.api import plugin, lib
+
+
+class CreateMultiverseUsdOver(plugin.Creator):
+    """Multiverse USD data"""
+
+    name = "usdOverrideMain"
+    label = "Multiverse USD Override"
+    family = "usdOverride"
+    icon = "cubes"
+
+    def __init__(self, *args, **kwargs):
+        super(CreateMultiverseUsdOver, self).__init__(*args, **kwargs)
+
+        # Add animation data first, since it maintains order.
+        self.data.update(lib.collect_animation_data(True))
+
+        self.data["writeAll"] = False
+        self.data["writeTransforms"] = True
+        self.data["writeVisibility"] = True
+        self.data["writeAttributes"] = True
+        self.data["writeMaterials"] = True
+        self.data["writeVariants"] = True
+        self.data["writeVariantsDefinition"] = True
+        self.data["writeActiveState"] = True
+        self.data["writeNamespaces"] = False
+        self.data["numTimeSamples"] = 1
+        self.data["timeSamplesSpan"] = 0.0

openpype/hosts/maya/plugins/load/load_multiverse_usd.py

@@ -0,0 +1,102 @@
+# -*- coding: utf-8 -*-
+import maya.cmds as cmds
+
+from openpype.pipeline import (
+    load,
+    get_representation_path
+)
+from openpype.hosts.maya.api.lib import (
+    maintained_selection,
+    namespaced,
+    unique_namespace
+)
+from openpype.hosts.maya.api.pipeline import containerise
+
+
+class MultiverseUsdLoader(load.LoaderPlugin):
+    """Load the USD by Multiverse"""
+
+    families = ["model", "usd", "usdComposition", "usdOverride",
+                "pointcache", "animation"]
+    representations = ["usd", "usda", "usdc", "usdz", "abc"]
+
+    label = "Read USD by Multiverse"
+    order = -10
+    icon = "code-fork"
+    color = "orange"
+
+    def load(self, context, name=None, namespace=None, options=None):
+
+        asset = context['asset']['name']
+        namespace = namespace or unique_namespace(
+            asset + "_",
+            prefix="_" if asset[0].isdigit() else "",
+            suffix="_",
+        )
+
+        # Create the shape
+        cmds.loadPlugin("MultiverseForMaya", quiet=True)
+
+        shape = None
+        transform = None
+        with maintained_selection():
+            cmds.namespace(addNamespace=namespace)
+            with namespaced(namespace, new=False):
+                import multiverse
+                shape = multiverse.CreateUsdCompound(self.fname)
+                transform = cmds.listRelatives(
+                    shape, parent=True, fullPath=True)[0]
+
+                # Lock the shape node so the user cannot delete it.
+                cmds.lockNode(shape, lock=True)
+
+        nodes = [transform, shape]
+        self[:] = nodes
+
+        return containerise(
+            name=name,
+            namespace=namespace,
+            nodes=nodes,
+            context=context,
+            loader=self.__class__.__name__)
+
+    def update(self, container, representation):
+        # type: (dict, dict) -> None
+        """Update container with specified representation."""
+        node = container['objectName']
+        assert cmds.objExists(node), "Missing container"
+
+        members = cmds.sets(node, query=True) or []
+        shapes = cmds.ls(members, type="mvUsdCompoundShape")
+        assert shapes, "Cannot find mvUsdCompoundShape in container"
+
+        path = get_representation_path(representation)
+
+        import multiverse
+        for shape in shapes:
+            multiverse.SetUsdCompoundAssetPaths(shape, [path])
+
+        cmds.setAttr("{}.representation".format(node),
+                     str(representation["_id"]),
+                     type="string")
+
+    def switch(self, container, representation):
+        self.update(container, representation)
+
+    def remove(self, container):
+        # type: (dict) -> None
+        """Remove loaded container."""
+        # Delete container and its contents
+        if cmds.objExists(container['objectName']):
+            members = cmds.sets(container['objectName'], query=True) or []
+            cmds.delete([container['objectName']] + members)
+
+        # Remove the namespace, if empty
+        namespace = container['namespace']
+        if cmds.namespace(exists=namespace):
+            members = cmds.namespaceInfo(namespace, listNamespace=True)
+            if not members:
+                cmds.namespace(removeNamespace=namespace)
+            else:
+                self.log.warning("Namespace not deleted because it "
+                                 "still has members: %s", namespace)

openpype/hosts/maya/plugins/publish/extract_multiverse_usd.py

@@ -0,0 +1,210 @@
+import os
+import six
+
+from maya import cmds
+
+import openpype.api
+from openpype.hosts.maya.api.lib import maintained_selection
+
+
+class ExtractMultiverseUsd(openpype.api.Extractor):
+    """Extractor for USD by Multiverse."""
+
+    label = "Extract Multiverse USD"
+    hosts = ["maya"]
+    families = ["usd"]
+
+    @property
+    def options(self):
+        """Overridable options for Multiverse USD Export
+
+        Given in the following format
+            - {NAME: EXPECTED TYPE}
+
+        If the overridden option's type does not match,
+        the option is not included and a warning is logged.
+
+        """
+
+        return {
+            "stripNamespaces": bool,
+            "mergeTransformAndShape": bool,
+            "writeAncestors": bool,
+            "flattenParentXforms": bool,
+            "writeSparseOverrides": bool,
+            "useMetaPrimPath": bool,
+            "customRootPath": str,
+            "customAttributes": str,
+            "nodeTypesToIgnore": str,
+            "writeMeshes": bool,
+            "writeCurves": bool,
+            "writeParticles": bool,
+            "writeCameras": bool,
+            "writeLights": bool,
+            "writeJoints": bool,
+            "writeCollections": bool,
+            "writePositions": bool,
+            "writeNormals": bool,
+            "writeUVs": bool,
+            "writeColorSets": bool,
+            "writeTangents": bool,
+            "writeRefPositions": bool,
+            "writeBlendShapes": bool,
+            "writeDisplayColor": bool,
+            "writeSkinWeights": bool,
+            "writeMaterialAssignment": bool,
+            "writeHardwareShader": bool,
+            "writeShadingNetworks": bool,
+            "writeTransformMatrix": bool,
+            "writeUsdAttributes": bool,
+            "timeVaryingTopology": bool,
+            "customMaterialNamespace": str,
+            "numTimeSamples": int,
+            "timeSamplesSpan": float
+        }
+
+    @property
+    def default_options(self):
+        """The default options for Multiverse USD extraction."""
+
+        return {
+            "stripNamespaces": False,
+            "mergeTransformAndShape": False,
+            "writeAncestors": True,
+            "flattenParentXforms": False,
+            "writeSparseOverrides": False,
+            "useMetaPrimPath": False,
+            "customRootPath": str(),
+            "customAttributes": str(),
+            "nodeTypesToIgnore": str(),
+            "writeMeshes": True,
+            "writeCurves": True,
+            "writeParticles": True,
+            "writeCameras": False,
+            "writeLights": False,
+            "writeJoints": False,
+            "writeCollections": False,
+            "writePositions": True,
+            "writeNormals": True,
+            "writeUVs": True,
+            "writeColorSets": False,
+            "writeTangents": False,
+            "writeRefPositions": False,
+            "writeBlendShapes": False,
+            "writeDisplayColor": False,
+            "writeSkinWeights": False,
+            "writeMaterialAssignment": False,
+            "writeHardwareShader": False,
+            "writeShadingNetworks": False,
+            "writeTransformMatrix": True,
+            "writeUsdAttributes": False,
+            "timeVaryingTopology": False,
+            "customMaterialNamespace": str(),
+            "numTimeSamples": 1,
+            "timeSamplesSpan": 0.0
+        }
+
+    def parse_overrides(self, instance, options):
+        """Inspect data of instance to determine overridden options"""
+
+        for key in instance.data:
+            if key not in self.options:
+                continue
+
+            # Ensure the data is of correct type
+            value = instance.data[key]
+            if isinstance(value, six.text_type):
+                value = str(value)
+            if not isinstance(value, self.options[key]):
+                self.log.warning(
+                    "Overridden attribute {key} was of "
+                    "the wrong type: {invalid_type} "
+                    "- should have been {valid_type}".format(
+                        key=key,
+                        invalid_type=type(value).__name__,
+                        valid_type=self.options[key].__name__))
+                continue
+
+            options[key] = value
+
+        return options
+
+    def process(self, instance):
+        # Load plugin firstly
+        cmds.loadPlugin("MultiverseForMaya", quiet=True)
+
+        # Define output file path
+        staging_dir = self.staging_dir(instance)
+        file_name = "{}.usd".format(instance.name)
+        file_path = os.path.join(staging_dir, file_name)
+        file_path = file_path.replace('\\', '/')
+
+        # Parse export options
+        options = self.default_options
+        options = self.parse_overrides(instance, options)
+        self.log.info("Export options: {0}".format(options))
+
+        # Perform extraction
+        self.log.info("Performing extraction ...")
+
+        with maintained_selection():
+            members = instance.data("setMembers")
+            members = cmds.ls(members,
+                              dag=True,
+                              shapes=True,
+                              type=("mesh"),
+                              noIntermediate=True,
+                              long=True)
+            self.log.info('Collected object {}'.format(members))
+
+            import multiverse
+
+            time_opts = None
+            frame_start = instance.data['frameStart']
+            frame_end = instance.data['frameEnd']
+            handle_start = instance.data['handleStart']
+            handle_end = instance.data['handleEnd']
+            step = instance.data['step']
+            fps = instance.data['fps']
+            if frame_end != frame_start:
+                time_opts = multiverse.TimeOptions()
+
+                time_opts.writeTimeRange = True
+                time_opts.frameRange = (
+                    frame_start - handle_start, frame_end + handle_end)
+                time_opts.frameIncrement = step
+                time_opts.numTimeSamples = instance.data["numTimeSamples"]
+                time_opts.timeSamplesSpan = instance.data["timeSamplesSpan"]
+                time_opts.framePerSecond = fps
+
+            asset_write_opts = multiverse.AssetWriteOptions(time_opts)
+            options_discard_keys = {
+                'numTimeSamples',
+                'timeSamplesSpan',
+                'frameStart',
+                'frameEnd',
+                'handleStart',
+                'handleEnd',
+                'step',
+                'fps'
+            }
+            for key, value in options.items():
+                if key in options_discard_keys:
+                    continue
+                setattr(asset_write_opts, key, value)
+
+            multiverse.WriteAsset(file_path, members, asset_write_opts)
+
+        if "representations" not in instance.data:
+            instance.data["representations"] = []
+
+        representation = {
+            'name': 'usd',
+            'ext': 'usd',
+            'files': file_name,
+            "stagingDir": staging_dir
+        }
+        instance.data["representations"].append(representation)
+
+        self.log.info("Extracted instance {} to {}".format(
+            instance.name, file_path))

openpype/hosts/maya/plugins/publish/extract_multiverse_usd_comp.py

@@ -0,0 +1,151 @@
+import os
+
+from maya import cmds
+
+import openpype.api
+from openpype.hosts.maya.api.lib import maintained_selection
+
+
+class ExtractMultiverseUsdComposition(openpype.api.Extractor):
+    """Extractor of Multiverse USD Composition."""
+
+    label = "Extract Multiverse USD Composition"
+    hosts = ["maya"]
+    families = ["usdComposition"]
+
+    @property
+    def options(self):
+        """Overridable options for Multiverse USD Export
+
+        Given in the following format
+            - {NAME: EXPECTED TYPE}
+
+        If the overridden option's type does not match,
+        the option is not included and a warning is logged.
+
+        """
+
+        return {
+            "stripNamespaces": bool,
+            "mergeTransformAndShape": bool,
+            "flattenContent": bool,
+            "writePendingOverrides": bool,
+            "numTimeSamples": int,
+            "timeSamplesSpan": float
+        }
+
+    @property
+    def default_options(self):
+        """The default options for Multiverse USD extraction."""
+
+        return {
+            "stripNamespaces": True,
+            "mergeTransformAndShape": False,
+            "flattenContent": False,
+            "writePendingOverrides": False,
+            "numTimeSamples": 1,
+            "timeSamplesSpan": 0.0
+        }
+
+    def parse_overrides(self, instance, options):
+        """Inspect data of instance to determine overridden options"""
+
+        for key in instance.data:
+            if key not in self.options:
+                continue
+
+            # Ensure the data is of correct type
+            value = instance.data[key]
+            if not isinstance(value, self.options[key]):
+                self.log.warning(
+                    "Overridden attribute {key} was of "
+                    "the wrong type: {invalid_type} "
+                    "- should have been {valid_type}".format(
+                        key=key,
+                        invalid_type=type(value).__name__,
+                        valid_type=self.options[key].__name__))
+                continue
+
+            options[key] = value
+
+        return options
+
+    def process(self, instance):
+        # Load plugin firstly
+        cmds.loadPlugin("MultiverseForMaya", quiet=True)
+
+        # Define output file path
+        staging_dir = self.staging_dir(instance)
+        file_name = "{}.usd".format(instance.name)
+        file_path = os.path.join(staging_dir, file_name)
+        file_path = file_path.replace('\\', '/')
+
+        # Parse export options
+        options = self.default_options
+        options = self.parse_overrides(instance, options)
+        self.log.info("Export options: {0}".format(options))
+
+        # Perform extraction
+        self.log.info("Performing extraction ...")
+
+        with maintained_selection():
+            members = instance.data("setMembers")
+            members = cmds.ls(members,
+                              dag=True,
+                              shapes=True,
+                              type="mvUsdCompoundShape",
+                              noIntermediate=True,
+                              long=True)
+            self.log.info('Collected object {}'.format(members))
+
+            import multiverse
+
+            time_opts = None
+            frame_start = instance.data['frameStart']
+            frame_end = instance.data['frameEnd']
+            handle_start = instance.data['handleStart']
+            handle_end = instance.data['handleEnd']
+            step = instance.data['step']
+            fps = instance.data['fps']
+            if frame_end != frame_start:
+                time_opts = multiverse.TimeOptions()
+
+                time_opts.writeTimeRange = True
+                time_opts.frameRange = (
+                    frame_start - handle_start, frame_end + handle_end)
+                time_opts.frameIncrement = step
+                time_opts.numTimeSamples = instance.data["numTimeSamples"]
+                time_opts.timeSamplesSpan = instance.data["timeSamplesSpan"]
+                time_opts.framePerSecond = fps
+
+            comp_write_opts = multiverse.CompositionWriteOptions()
+            options_discard_keys = {
+                'numTimeSamples',
+                'timeSamplesSpan',
+                'frameStart',
+                'frameEnd',
+                'handleStart',
+                'handleEnd',
+                'step',
+                'fps'
+            }
+            for key, value in options.items():
+                if key in options_discard_keys:
+                    continue
+                setattr(comp_write_opts, key, value)
+
+            multiverse.WriteComposition(file_path, members, comp_write_opts)
+
+        if "representations" not in instance.data:
+            instance.data["representations"] = []
+
+        representation = {
+            'name': 'usd',
+            'ext': 'usd',
+            'files': file_name,
+            "stagingDir": staging_dir
+        }
+        instance.data["representations"].append(representation)
+
+        self.log.info("Extracted instance {} to {}".format(
+            instance.name, file_path))

openpype/hosts/maya/plugins/publish/extract_multiverse_usd_over.py

@@ -0,0 +1,139 @@
+import os
+
+import openpype.api
+from openpype.hosts.maya.api.lib import maintained_selection
+
+from maya import cmds
+
+
+class ExtractMultiverseUsdOverride(openpype.api.Extractor):
+    """Extractor for USD Override by Multiverse."""
+
+    label = "Extract Multiverse USD Override"
+    hosts = ["maya"]
+    families = ["usdOverride"]
+
+    @property
+    def options(self):
+        """Overridable options for Multiverse USD Export
+
+        Given in the following format
+            - {NAME: EXPECTED TYPE}
+
+        If the overridden option's type does not match,
+        the option is not included and a warning is logged.
+
+        """
+
+        return {
+            "writeAll": bool,
+            "writeTransforms": bool,
+            "writeVisibility": bool,
+            "writeAttributes": bool,
+            "writeMaterials": bool,
+            "writeVariants": bool,
+            "writeVariantsDefinition": bool,
+            "writeActiveState": bool,
+            "writeNamespaces": bool,
+            "numTimeSamples": int,
+            "timeSamplesSpan": float
+        }
+
+    @property
+    def default_options(self):
+        """The default options for Multiverse USD extraction."""
+
+        return {
+            "writeAll": False,
+            "writeTransforms": True,
+            "writeVisibility": True,
+            "writeAttributes": True,
+            "writeMaterials": True,
+            "writeVariants": True,
+            "writeVariantsDefinition": True,
+            "writeActiveState": True,
+            "writeNamespaces": False,
+            "numTimeSamples": 1,
+            "timeSamplesSpan": 0.0
+        }
+
+    def process(self, instance):
+        # Load plugin firstly
+        cmds.loadPlugin("MultiverseForMaya", quiet=True)
+
+        # Define output file path
+        staging_dir = self.staging_dir(instance)
+        file_name = "{}.usda".format(instance.name)
+        file_path = os.path.join(staging_dir, file_name)
+        file_path = file_path.replace("\\", "/")
+
+        # Parse export options
+        options = self.default_options
+        self.log.info("Export options: {0}".format(options))
+
+        # Perform extraction
+        self.log.info("Performing extraction ...")
+
+        with maintained_selection():
+            members = instance.data("setMembers")
+            members = cmds.ls(members,
+                              dag=True,
+                              shapes=True,
+                              type="mvUsdCompoundShape",
+                              noIntermediate=True,
+                              long=True)
+            self.log.info("Collected object {}".format(members))
+
+            # TODO: Deal with asset, composition, overide with options.
+            import multiverse
+
+            time_opts = None
+            frame_start = instance.data["frameStart"]
+            frame_end = instance.data["frameEnd"]
+            handle_start = instance.data["handleStart"]
+            handle_end = instance.data["handleEnd"]
+            step = instance.data["step"]
+            fps = instance.data["fps"]
+            if frame_end != frame_start:
+                time_opts = multiverse.TimeOptions()
+
+                time_opts.writeTimeRange = True
+                time_opts.frameRange = (
+                    frame_start - handle_start, frame_end + handle_end)
+                time_opts.frameIncrement = step
+                time_opts.numTimeSamples = instance.data["numTimeSamples"]
+                time_opts.timeSamplesSpan = instance.data["timeSamplesSpan"]
+                time_opts.framePerSecond = fps
+
+            over_write_opts = multiverse.OverridesWriteOptions(time_opts)
+            options_discard_keys = {
+                "numTimeSamples",
+                "timeSamplesSpan",
+                "frameStart",
+                "frameEnd",
+                "handleStart",
+                "handleEnd",
+                "step",
+                "fps"
+            }
+            for key, value in options.items():
+                if key in options_discard_keys:
+                    continue
+                setattr(over_write_opts, key, value)
+
+            for member in members:
+                multiverse.WriteOverrides(file_path, member, over_write_opts)
+
+        if "representations" not in instance.data:
+            instance.data["representations"] = []
+
+        representation = {
+            "name": "usd",
+            "ext": "usd",
+            "files": file_name,
+            "stagingDir": staging_dir
+        }
+        instance.data["representations"].append(representation)
+
+        self.log.info("Extracted instance {} to {}".format(
+            instance.name, file_path))

openpype/plugins/publish/integrate_new.py

@@ -105,7 +105,9 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
                 "effect",
                 "xgen",
                 "hda",
-                "usd"
+                "usd",
+                "usdComposition",
+                "usdOverride"
                 ]
     exclude_families = ["clip"]
     db_representation_context_keys = [

openpype/settings/constants.py

@@ -8,11 +8,11 @@ M_ENVIRONMENT_KEY = "__environment_keys__"
 # Metadata key for storing dynamic created labels
 M_DYNAMIC_KEY_LABEL = "__dynamic_keys_labels__"
 
-METADATA_KEYS = (
+METADATA_KEYS = frozenset([
     M_OVERRIDDEN_KEY,
     M_ENVIRONMENT_KEY,
     M_DYNAMIC_KEY_LABEL
-)
+])
 
 # Keys where studio's system overrides are stored
 GLOBAL_SETTINGS_KEY = "global_settings"

openpype/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.9.2-nightly.2"
+__version__ = "3.9.2-nightly.3"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "OpenPype"
-version = "3.9.2-nightly.2" # OpenPype
+version = "3.9.2-nightly.3" # OpenPype
 description = "Open VFX and Animation pipeline with support."
 authors = ["OpenPype Team <info@openpype.io>"]
 license = "MIT License"