Merge pull request #207 from Simarilius-uk/main

Blender 4.4 compat

Author: Simarilius-uk

i_scene_cp77_gltf/importers/entity_import.py

@@ -750,7 +750,8 @@ def importEnt(with_materials, filepath='', appearances=[], exclude_meshes=[], in
                                     obj = draw_capsule_collider(submeshName, new_col, r, h, position, rotation, physmat, collision_type)
                                 except Exception as e:
                                     print('uh oh', e)
-
+    if rig:
+        rig.pose_position = 'REST'
     if not cp77_addon_prefs.non_verbose:
         if app_name:
             print('') 

i_scene_cp77_gltf/importers/import_with_materials.py

@@ -100,8 +100,10 @@ def CP77GLBimport(self, with_materials, remap_depot, exclude_unused_mats=True, i
         filename=os.path.splitext(f['name'])[0]
         filepath = os.path.join(directory, f['name'])
         vers = bpy.app.version
-        if vers[0] == 4 and vers[1] >= 2:
+        if vers[0] == 4 and vers[1] >= 2 and vers[1] < 4:
             gltf_importer = glTFImporter(filepath, { "files": None, "loglevel": 0, "import_pack_images" :True, "merge_vertices" :False, "import_shading" : 'NORMALS', "bone_heuristic":heuristic, "guess_original_bind_pose" : False, "import_user_extensions": "",'disable_bone_shape':octos, 'bone_shape_scale_factor':1.0})
+        elif vers[0] == 4 and vers[1] > 3:
+            gltf_importer = glTFImporter(filepath, { "files": None, "loglevel": 0, "import_pack_images" :True, "merge_vertices" :False, "import_shading" : 'NORMALS', "bone_heuristic":heuristic, "guess_original_bind_pose" : False, "import_user_extensions": "",'disable_bone_shape':octos, 'bone_shape_scale_factor':1.0, 'import_scene_extras':True,'import_select_created_objects':True})
         else:
             gltf_importer = glTFImporter(filepath, { "files": None, "loglevel": 0, "import_pack_images" :True, "merge_vertices" :False, "import_shading" : 'NORMALS', "bone_heuristic":heuristic, "guess_original_bind_pose" : False, "import_user_extensions": "",'disable_bone_shape':octos,})
         gltf_importer.read()