Flag groups fixes

Selection and export was not handled correctly when a vertex had an invalid group value. It did not properly fall back to the 1st group defined (if any were defined at all).

Author: MrClock

Arma3ObjectBuilder/io/export_p3d.py

@@ -105,32 +105,32 @@ def bake_flags_vertex(obj):
     with utils.edit_bmesh(obj) as bm:
         bm.verts.ensure_lookup_table()
 
-        default_flag = get_prefs().flag_vertex
-
         layer = flagutils.get_layer_flags_vertex(bm)
         flags_vertex = {i: item.get_flag() for i, item in enumerate(obj.a3ob_properties_object_flags.vertex)}
-        if len(flags_vertex) > 0:
+        if len(flags_vertex) == 0:
+            default_flag = get_prefs().flag_vertex
             for vert in bm.verts:
-                vert[layer] = flags_vertex.get(vert[layer], default_flag)
+                vert[layer] = default_flag
         else:
+            flag = flags_vertex[0]
             for vert in bm.verts:
-                vert[layer] = default_flag
+                vert[layer] = flags_vertex.get(vert[layer], flag)
 
 
 def bake_flags_face(obj):
     with utils.edit_bmesh(obj) as bm:
         bm.faces.ensure_lookup_table()
 
-        default_flag = get_prefs().flag_face
-
         layer = flagutils.get_layer_flags_face(bm)
         flags_face = {i: item.get_flag() for i, item in enumerate(obj.a3ob_properties_object_flags.face)}
-        if len(flags_face) > 0:
+        if len(flags_face) == 0:
+            default_flag = get_prefs().flag_face
             for face in bm.faces:
-                face[layer] = flags_face.get(face[layer], default_flag)
+                face[layer] = default_flag
         else:
+            flag = flags_face[0]
             for face in bm.faces:
-                face[layer] = default_flag
+                face[layer] = flags_face.get(face[layer], flag)
 
 
 def blank_flags_vertex(obj):

Arma3ObjectBuilder/utilities/flags.py

@@ -138,13 +138,14 @@ def assign_group_vertex(obj, group_id):
 
 
 def select_group_vertex(obj, group_id, select = True):
+    group_count = len(obj.a3ob_properties_object_flags.vertex)
     with utils.edit_bmesh(obj) as bm:
         bm.verts.ensure_lookup_table()
 
         layer = get_layer_flags_vertex(bm)
-        
         for vertex in bm.verts:
-            if vertex[layer] == group_id:
+            value = vertex[layer]
+            if value == group_id or (group_id == 0 and not (0 <= value < group_count)):
                 vertex.select = select
 
 
@@ -178,13 +179,14 @@ def assign_group_face(obj, group_id):
 
 
 def select_group_face(obj, group_id, select = True):
+    group_count = len(obj.a3ob_properties_object_flags.face)
     with utils.edit_bmesh(obj) as bm:
         bm.faces.ensure_lookup_table()
 
         layer = get_layer_flags_face(bm)
-        
         for face in bm.faces:
-            if face[layer] == group_id:
+            value = face[layer]
+            if value == group_id or (group_id == 0 and not (0 <= value < group_count)):
                 face.select = select