Merge branch 'develop' into enhancement/OP-2925_move-remaining-plugins

openpype/hosts/maya/plugins/inventory/import_modelrender.py

@@ -1,6 +1,6 @@
 import json
 from avalon import io
-
+from bson.objectid import ObjectId
 from openpype.pipeline import (
     InventoryAction,
     get_representation_context,
@@ -41,7 +41,7 @@ class ImportModelRender(InventoryAction):
                     nodes.append(n)
 
             repr_doc = io.find_one({
-                "_id": io.ObjectId(container["representation"]),
+                "_id": ObjectId(container["representation"]),
             })
             version_id = repr_doc["parent"]
 

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

@@ -7,6 +7,8 @@ loader will use them instead of native vray vrmesh format.
 """
 import os
 
+from bson.objectid import ObjectId
+
 import maya.cmds as cmds
 
 from avalon import io
@@ -186,7 +188,7 @@ class VRayProxyLoader(load.LoaderPlugin):
         abc_rep = io.find_one(
             {
                 "type": "representation",
-                "parent": io.ObjectId(version_id),
+                "parent": ObjectId(version_id),
                 "name": "abc"
             })
 

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

@@ -6,7 +6,7 @@ from maya import cmds
 
 import openpype.api
 from openpype.hosts.maya.api.lib import maintained_selection
-from avalon.pipeline import AVALON_CONTAINER_ID
+from openpype.pipeline import AVALON_CONTAINER_ID
 
 
 class ExtractMayaSceneRaw(openpype.api.Extractor):