Merge pull request #497 from Candoran2/develop

Slight fix for triangle assignment to bodypart on partition import

Author: neomonkeus

io_scene_niftools/modules/nif_export/geometry/mesh/__init__.py

@@ -460,6 +460,24 @@ def export_tri_shapes(self, b_obj, n_parent, n_root, trishape_name=None):
 
                     if NifData.data.version >= 0x04020100 and NifOp.props.skin_partition:
                         NifLog.info("Creating skin partition")
+
+                        # warn on bad config settings
+                        if game == 'OBLIVION':
+                            if NifOp.props.pad_bones:
+                                NifLog.warn("Using padbones on Oblivion export. Disable the pad bones option to get higher quality skin partitions.")
+                        if game in ('OBLIVION', 'FALLOUT_3'):
+                            if NifOp.props.max_bones_per_partition < 18:
+                                NifLog.warn("Using less than 18 bones per partition on Oblivion/Fallout 3 export."
+                                            "Set it to 18 to get higher quality skin partitions.")
+                            elif NifOp.props.max_bones_per_partition > 18:
+                                NifLog.warn("Using more than 18 bones per partition on Oblivion/Fallout 3 export."
+                                            "This may cause issues in-game.")
+                        if game == 'SKYRIM':
+                            if NifOp.props.max_bones_per_partition < 24:
+                                NifLog.warn("Using less than 24 bones per partition on Skyrim export."
+                                            "Set it to 24 to get higher quality skin partitions.")
+                        # Skyrim Special Edition has a limit of 80 bones per partition, but export is not yet supported
+
                         part_order = [getattr(NifFormat.BSDismemberBodyPartType, face_map.name, None) for face_map in b_obj.face_maps]
                         part_order = [body_part for body_part in part_order if body_part is not None]
                         # override pyffi trishape.update_skin_partition with custom one (that allows ordering)
@@ -475,18 +493,6 @@ def export_tri_shapes(self, b_obj, n_parent, n_root, trishape_name=None):
                             maximize_bone_sharing=(game in ('FALLOUT_3', 'SKYRIM')),
                             part_sort_order=part_order)
 
-                        # warn on bad config settings
-                        if game == 'OBLIVION':
-                            if NifOp.props.pad_bones:
-                                NifLog.warn("Using padbones on Oblivion export. Disable the pad bones option to get higher quality skin partitions.")
-                        if game in ('OBLIVION', 'FALLOUT_3'):
-                            if NifOp.props.max_bones_per_partition < 18:
-                                NifLog.warn("Using less than 18 bones per partition on Oblivion/Fallout 3 export."
-                                            "Set it to 18 to get higher quality skin partitions.")
-                        if game == 'SKYRIM':
-                            if NifOp.props.max_bones_per_partition < 24:
-                                NifLog.warn("Using less than 24 bones per partition on Skyrim export."
-                                            "Set it to 24 to get higher quality skin partitions.")
                         if lostweight > NifOp.props.epsilon:
                             NifLog.warn(f"Lost {lostweight:f} in vertex weights while creating a skin partition for Blender object '{b_obj.name}' (nif block '{trishape.name}')")
 

io_scene_niftools/modules/nif_import/geometry/vertex/groups.py

@@ -164,8 +164,14 @@ def import_skin(ni_block, b_obj):
                                 v_group.add([vert], w, 'REPLACE')
 
         # import body parts as face maps
-        # get faces (triangles) as map of tuples to index
-        tri_map = {frozenset(polygon.vertices): polygon.index for polygon in b_obj.data.polygons}
+        # get faces (triangles) as map of unordered vertices to list of indices
+        tri_map = {}
+        for polygon in b_obj.data.polygons:
+            vertices = frozenset(polygon.vertices)
+            if vertices in tri_map:
+                tri_map[vertices].append(polygon.index)
+            else:
+                tri_map[vertices] = [polygon.index]
         if isinstance(skininst, NifFormat.BSDismemberSkinInstance):
             skinpart = ni_block.get_skin_partition()
             for bodypart, skinpartblock in zip(skininst.partitions, skinpart.skin_partition_blocks):
@@ -178,4 +184,5 @@ def import_skin(ni_block, b_obj):
                     f_group = b_obj.face_maps.new(name=group_name)
 
                 # add the triangles to the face map
-                f_group.add([tri_map[frozenset(vertices)] for vertices in skinpartblock.get_mapped_triangles()])
+                for vertices in skinpartblock.get_mapped_triangles():
+                    f_group.add(tri_map[frozenset(vertices)])