Merge pull request #1617 from ousttrue/fix10/spring_bone_import

joint が複数の chain に所属する場合に AddComponent に失敗する
vrm-c · Apr 19, 2022 · 2f6b522 · 2f6b522
2 parents 45aab79 + 5b815a8
commit 2f6b522
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/Assets/VRM10/Runtime/IO/Vrm10Importer.cs b/Assets/VRM10/Runtime/IO/Vrm10Importer.cs
@@ -615,7 +615,17 @@ async Task LoadSpringBoneAsync(IAwaitCaller awaitCaller, Vrm10Instance controlle
                             // に基づきデフォルト値を補う
 
                             // node is required
-                            var joint = Nodes[gltfJoint.Node.Value].gameObject.AddComponent<VRM10SpringBoneJoint>();
+                            var go = Nodes[gltfJoint.Node.Value].gameObject;
+                            var joint = go.GetComponent<VRM10SpringBoneJoint>();
+                            if (joint != null)
+                            {
+                                // 仕様違反。マイグレーションで発生しうるのと、エクスポーターでの除外などがされていないので、
+                                // エラーにせずに飛ばす
+                                Debug.LogWarning($"duplicated spring joint: {Data.TargetPath}");
+                                continue;
+                            }
+
+                            joint = go.AddComponent<VRM10SpringBoneJoint>();
                             joint.m_jointRadius = gltfJoint.HitRadius.GetValueOrDefault(0.0f);
                             joint.m_dragForce = gltfJoint.DragForce.GetValueOrDefault(0.5f);
                             joint.m_gravityDir = gltfJoint.GravityDir != null ? Vector3InvertX(gltfJoint.GravityDir) : Vector3.down;