addons: objects.link/unlink syntax update

Changed objects.link and objects.unlink from scene to collection

2 files changed, 9 insertions, 6 deletions

diff --git a/io_scene_ms3d/ms3d_export.py b/io_scene_ms3d/ms3d_export.py
index aed7f400..004a0e4e 100644
--- a/io_scene_ms3d/ms3d_export.py
+++ b/io_scene_ms3d/ms3d_export.py
@@ -221,6 +221,7 @@ class Ms3dExporter():
     def create_geometry(self, blender_context, ms3d_model, blender_mesh_objects, blender_to_ms3d_bones):
         blender_view_layer = blender_context.view_layer
         blender_scene = blender_context.scene
+        blender_collection = blender_context.collection
 
         blender_to_ms3d_vertices = {}
         blender_to_ms3d_triangles = {}
@@ -271,7 +272,7 @@ class Ms3dExporter():
             blender_mesh_temp = blender_mesh_object.data.copy()
             blender_mesh_object_temp = blender_mesh_object.copy()
             blender_mesh_object_temp.data = blender_mesh_temp
-            blender_scene.objects.link(blender_mesh_object_temp)
+            blender_collection.objects.link(blender_mesh_object_temp)
             blender_view_layer.objects.active = blender_mesh_object_temp
 
             # apply transform
@@ -532,7 +533,7 @@ class Ms3dExporter():
 
             ##########################
             # remove the temporary data
-            blender_scene.objects.unlink(blender_mesh_object_temp)
+            blender_collection.objects.unlink(blender_mesh_object_temp)
             if blender_mesh_temp is not None:
                 blender_mesh_temp.user_clear()
                 blender_context.blend_data.meshes.remove(blender_mesh_temp)
diff --git a/io_scene_ms3d/ms3d_import.py b/io_scene_ms3d/ms3d_import.py
index d4fd6f2c..01019a12 100644
--- a/io_scene_ms3d/ms3d_import.py
+++ b/io_scene_ms3d/ms3d_import.py
@@ -233,13 +233,14 @@ class Ms3dImporter():
         ###blender_mesh_object.parent = blender_armature_object
 
         blender_scene = blender_context.scene
+        blender_collection = blender_context.collection
 
         blender_group = blender_context.blend_data.collections.new(
                 FORMAT_GROUP.format(ms3d_model.name))
         blender_empty_object = blender_context.blend_data.objects.new(
                 FORMAT_EMPTY_OBJECT.format(ms3d_model.name), None)
         blender_empty_object.location = blender_scene.cursor_location
-        blender_scene.objects.link(blender_empty_object)
+        blender_collection.objects.link(blender_empty_object)
         blender_group.objects.link(blender_empty_object)
 
         for blender_object in blender_objects:
@@ -284,9 +285,9 @@ class Ms3dImporter():
         ##########################
         # blender stuff:
         # link to blender scene
-        blender_scene = blender_context.scene
+        blender_collection = blender_context.collection
         blender_view_layer = blender_context.view_layer
-        blender_scene.objects.link(blender_mesh_object)
+        blender_collection.objects.link(blender_mesh_object)
         #blender_mesh_object.location = blender_scene.cursor_location
         enable_edit_mode(False, blender_context)
         select_all(False)
@@ -665,6 +666,7 @@ class Ms3dImporter():
     def create_animation(self, blender_context, ms3d_model, blender_mesh_object):
         ##########################
         # setup scene
+        blender_collection = blender_context.collection
         blender_scene = blender_context.scene
         blender_scene.render.fps = ms3d_model.animation_fps
         if ms3d_model.animation_fps:
@@ -696,7 +698,7 @@ class Ms3dImporter():
         blender_armature.use_auto_ik = True
         blender_armature_object = blender_context.blend_data.objects.new(
                 ms3d_armature_object_name, blender_armature)
-        blender_scene.objects.link(blender_armature_object)
+        blender_collection.objects.link(blender_armature_object)
         #blender_armature_object.location = blender_scene.cursor_location
         blender_armature_object.show_in_front = True