Merge pull request #6122 from decentraland/chore/sync

chore: sync main to dev
decentraland · Mar 6, 2024 · 9131e60 · 9131e60
2 parents 181d00d + 73c9e03
commit 9131e60
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/...cripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDController.cs b/...cripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDController.cs
@@ -817,7 +817,7 @@ private void SetAllColors(Color eyesColor, Color hairColor, Color bodyColor)
         private void UpdateAvatarModel(AvatarModel avatarModel)
         {
             view.UpdateAvatarPreview(avatarModel);
-            outfitsController.UpdateAvatarPreview(model.ToAvatarModel());
+            outfitsController.UpdateAvatarPreview(model.ToAvatarModel(extendedWearableUrns));
         }
 
         private void OnColorPickerToggled() =>

diff --git a/...ets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDModel.cs b/...ets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDModel.cs
@@ -13,12 +13,25 @@ public record BackpackEditorHUDModel
         public Color eyesColor;
         public HashSet<string> forceRender = new ();
 
-        public AvatarModel ToAvatarModel()
+        public AvatarModel ToAvatarModel(Dictionary<string, string> extendedWearableUrns = null)
         {
+            List<string> wearables;
+
+            if (extendedWearableUrns != null)
+            {
+                wearables = new List<string>();
+
+                foreach (string w in this.wearables.Keys)
+                    wearables.Add(extendedWearableUrns.TryGetValue(w, out string extendedUrn)
+                        ? extendedUrn : w);
+            }
+            else
+                wearables = this.wearables.Keys.ToList();
+
             return new AvatarModel
             {
                 bodyShape = bodyShape.id,
-                wearables = wearables.Keys.ToList(),
+                wearables = wearables,
                 hairColor = hairColor,
                 skinColor = skinColor,
                 eyeColor = eyesColor,