fix: proper handling when dresser report errors and return no mappings

poi-vrc · Apr 26, 2024 · 6894c4a · 6894c4a
1 parent 0bb762f
commit 6894c4a
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/Editor/UI/Presenters/Modules/ArmatureMappingWearableModuleEditorPresenter.cs b/Editor/UI/Presenters/Modules/ArmatureMappingWearableModuleEditorPresenter.cs
@@ -204,22 +204,30 @@ private void GenerateDresserMappings()
                 return;
             }
 
+            var avatarArmature = OneConfUtils.GuessArmature(_parentView.TargetAvatar, _view.AvatarArmatureName);
             var wearableArmature = OneConfUtils.GuessArmature(_parentView.TargetWearable, _view.WearableArmatureName);
 
             // execute default dresser (dresser selection is ignored now)
             var dresser = new StandardDresser();
             var settings = new StandardDresserSettings()
             {
                 SourceArmature = wearableArmature,
-                TargetArmaturePath = _view.AvatarArmatureName,
+                TargetArmaturePath = avatarArmature != null ? avatarArmature.name : _view.AvatarArmatureName,
                 DynamicsOption = ConvertToNewDynamicsOption(_view.DresserSettings.dynamicsOption)
             };
             _dresserReport = new DKReport();
             dresser.Execute(_dresserReport, _parentView.TargetAvatar, settings, out var objectMappings, out var tags);
 
-            // TODO: this is temporary for later migration to Object Mappings + Tags
-            var oldObjectMappings = ConvertToOldMappings(_parentView.TargetWearable.transform, objectMappings, tags);
-            UpdateMappingEditorView(oldObjectMappings);
+            if (objectMappings != null && tags != null)
+            {
+                // TODO: this is temporary for later migration to Object Mappings + Tags
+                var oldObjectMappings = ConvertToOldMappings(_parentView.TargetWearable.transform, objectMappings, tags);
+                UpdateMappingEditorView(oldObjectMappings);
+            }
+            else
+            {
+                UpdateMappingEditorView(null);
+            }
 
             ApplySettings();
             UpdateDresserReport();