Merge pull request #762 from ReinaS-64892/fix-NegotiateAAOConfigFiled…

…Name chore: rename to AAORemovalToIsland
ReinaS-64892 · Dec 28, 2024 · 3be7ff8 · 3be7ff8
2 parents 7df5cf5 + 015a582
commit 3be7ff8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Editor/NDMF/NegotiateAAOPass.cs b/Editor/NDMF/NegotiateAAOPass.cs
@@ -23,7 +23,7 @@ protected override void Execute(BuildContext context)
             if (tttComponents.Any() is false) { return; }
 
             var config = context.AvatarRootObject.GetComponent<NegotiateAAOConfig>();
-            var removalToIslandDisabling = config?.AAORemovalToIslandDisabling ?? true;
+            var removalToIsland = config?.AAORemovalToIsland ?? true;
             var uvEvacuationAndRegisterToAAO = config?.UVEvacuationAndRegisterToAAO ?? true;
             var overrideEvacuationIndex = (config?.OverrideEvacuationUVChannel ?? false) ? config?.OverrideEvacuationUVChannelIndex : null;
 
@@ -36,7 +36,7 @@ protected override void Execute(BuildContext context)
                 if (uvEvacuationAndRegisterToAAO && UVUsageCompabilityAPI.IsTexCoordUsed(smr, 0))
                     UVEvacuation(uvBuf, smr, overrideEvacuationIndex);
 
-                if (removalToIslandDisabling is false) { continue; }
+                if (removalToIsland is false) { continue; }
                 var removalProvider = MeshRemovalProvider.GetForRenderer(smr);
                 if (removalProvider is not null)
                     using (removalProvider)

diff --git a/Runtime/CommonComponent/NegotiateAAOConfig.cs b/Runtime/CommonComponent/NegotiateAAOConfig.cs
@@ -1,4 +1,5 @@
 using UnityEngine;
+using UnityEngine.Serialization;
 
 namespace net.rs64.TexTransTool
 {
@@ -11,7 +12,7 @@ public sealed class NegotiateAAOConfig : MonoBehaviour, ITexTransToolTag
         public bool UVEvacuationAndRegisterToAAO = true;
         public bool OverrideEvacuationUVChannel = false;
         [Range(1, 7)] public int OverrideEvacuationUVChannelIndex = 7;
-        public bool AAORemovalToIslandDisabling = true;
+        [FormerlySerializedAs("AAORemovalToIslandDisabling")] public bool AAORemovalToIsland = true;