Added cross-version compatibility for is_action_for_armature function

io_scene_psk_psa/psa/export/operators.py

@@ -1,4 +1,3 @@
-import re
 from collections import Counter
 from typing import List, Iterable, Dict, Tuple, cast, Optional
 
@@ -12,7 +11,7 @@ from .properties import PSA_PG_export, PSA_PG_export_action_list_item, filter_se
     get_sequences_from_name_and_frame_range
 from ..builder import build_psa, PsaBuildSequence, PsaBuildOptions
 from ..writer import write_psa
-from ...shared.helpers import populate_bone_collection_list, get_nla_strips_in_frame_range
+from ...shared.helpers import populate_bone_collection_list, get_nla_strips_in_frame_range, SemanticVersion
 from ...shared.ui import draw_bone_filter_mode
 
 
@@ -33,14 +32,27 @@ def get_sequences_propnames_from_source(sequence_source: str) -> Optional[Tuple[
 def is_action_for_armature(armature: Armature, action: Action):
     if len(action.fcurves) == 0:
         return False
-    bone_names = set([x.name for x in armature.bones])
+
-    for fcurve in action.fcurves:
+    version = SemanticVersion(bpy.app.version)
-        match = re.match(r'pose\.bones\[\"([^\"]+)\"](\[\"([^\"]+)\"])?', fcurve.data_path)
+
-        if not match:
+    if version < SemanticVersion((4, 4, 0)):
-            continue
+        import re
-        bone_name = match.group(1)
+        bone_names = set([x.name for x in armature.bones])
-        if bone_name in bone_names:
+        for fcurve in action.fcurves:
-            return True
+            match = re.match(r'pose\.bones\[\"([^\"]+)\"](\[\"([^\"]+)\"])?', fcurve.data_path)
+            if not match:
+                continue
+            bone_name = match.group(1)
+            if bone_name in bone_names:
+                return True
+    else:
+        # Look up the armature by ID and check if its data block pointer matches the armature.
+        for slot in filter(lambda x: x.id_root == 'OBJECT', action.slots):
+            # Lop off the 'OB' prefix from the identifier for the lookup.
+            object = bpy.data.objects.get(slot.identifier[2:], None)
+            if object and object.data == armature:
+                return True
+
     return False
 
 

io_scene_psk_psa/shared/helpers.py

@@ -1,4 +1,4 @@
-from typing import List, Iterable, cast
+from typing import List, Iterable, cast, Tuple
 
 import bpy
 from bpy.props import CollectionProperty
@@ -154,3 +154,57 @@ def get_export_bone_names(armature_object: Object, bone_filter_mode: str, bone_c
 
 def is_bdk_addon_loaded() -> bool:
     return 'bdk' in dir(bpy.ops)
+
+
+class SemanticVersion(object):
+    def __init__(self, version: Tuple[int, int, int]):
+        self.major, self.minor, self.patch = version
+
+    def __iter__(self):
+        yield self.major
+        yield self.minor
+        yield self.patch
+
+    @staticmethod
+    def compare(lhs: 'SemanticVersion', rhs: 'SemanticVersion') -> int:
+        """
+        Compares two semantic versions.
+
+        Returns:
+            -1 if lhs < rhs
+             0 if lhs == rhs
+             1 if lhs > rhs
+        """
+        for l, r in zip(lhs, rhs):
+            if l < r:
+                return -1
+            if l > r:
+                return 1
+        return 0
+
+    def __str__(self):
+        return f'{self.major}.{self.minor}.{self.patch}'
+
+    def __repr__(self):
+        return str(self)
+
+    def __eq__(self, other):
+        return self.compare(self, other) == 0
+
+    def __ne__(self, other):
+        return not self == other
+
+    def __lt__(self, other):
+        return self.compare(self, other) == -1
+
+    def __le__(self, other):
+        return self.compare(self, other) <= 0
+
+    def __gt__(self, other):
+        return self.compare(self, other) == 1
+
+    def __ge__(self, other):
+        return self.compare(self, other) >= 0
+
+    def __hash__(self):
+        return hash((self.major, self.minor, self.patch))