plugin - fallback for old ms2 collision layers

OpenNaja · Nov 12, 2023 · cc80d1b · cc80d1b
1 parent c78b349
commit cc80d1b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/plugin/modules_export/armature.py b/plugin/modules_export/armature.py
@@ -9,6 +9,7 @@
 from plugin.modules_export.collision import export_hitcheck
 from plugin.modules_import.armature import get_matrix
 from plugin.utils.matrix_util import bone_name_for_ovl, get_joint_name, Corrector, CorrectorRagdoll
+from plugin.utils.object import get_property
 from plugin.utils.shell import get_collection_endswith
 
 
@@ -198,8 +199,8 @@ def export_joints(bone_info, corrector):
 		joint_info.reset_field("hitchecks")
 		joint_info.reset_field("hitcheck_pointers")
 		for hitcheck, b_hitcheck in zip(joint_info.hitchecks, b_joint.children):
-			hitcheck.classification_name = b_hitcheck["ClassificationName"]
-			hitcheck.surface_name = b_hitcheck["SurfaceName"]
+			hitcheck.classification_name = get_property(b_hitcheck, "ClassificationName", default=get_property(b_hitcheck, "collision_ignore"))
+			hitcheck.surface_name = get_property(b_hitcheck, "SurfaceName", default=get_property(b_hitcheck, "collision_use"))
 			hitcheck.name = get_joint_name(b_hitcheck)
 			export_hitcheck(b_hitcheck, hitcheck, corrector)
 

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-c52441de1 - Sun Nov 12 20:26:16 2023 +0100
+c78b349d7 - Sun Nov 12 23:12:59 2023 +0100
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		c52441de1 - Sun Nov 12 20:26:16 2023 +0100
		c78b349d7 - Sun Nov 12 23:12:59 2023 +0100