AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-04-24 21:38:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix nested parameter saved setting (#1130)

Browse Source 
* fix: child parameters should not override parent saved setting

* fix: sibling parameters can override sibling saved setting
This commit is contained in:
nekobako 2024-09-14 09:49:20 +09:00 committed by GitHub
parent 1163fac2e7
commit 566a030730
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Editor/RenameParametersHook.cs
View File

@ -115,7 +115,7 @@ namespace nadena.dev.modular_avatar.core.editor
} }
} }
ResolvedParameter.saved |= info.ResolvedParameter.saved;
} }
public void MergeChild(ParameterInfo info) public void MergeChild(ParameterInfo info)
@ -128,8 +128,6 @@ namespace nadena.dev.modular_avatar.core.editor
ResolvedParameter.hasExplicitDefaultValue = info.ResolvedParameter.hasExplicitDefaultValue; ResolvedParameter.hasExplicitDefaultValue = info.ResolvedParameter.hasExplicitDefaultValue;
ResolvedParameter.m_overrideAnimatorDefaults = info.ResolvedParameter.m_overrideAnimatorDefaults; ResolvedParameter.m_overrideAnimatorDefaults = info.ResolvedParameter.m_overrideAnimatorDefaults;
} }
ResolvedParameter.saved = info.ResolvedParameter.saved;
} }
void MergeCommon(ParameterInfo info) void MergeCommon(ParameterInfo info)
@ -154,8 +152,6 @@ namespace nadena.dev.modular_avatar.core.editor
ConflictingValues = ConflictingValues.Union(info.ConflictingValues); ConflictingValues = ConflictingValues.Union(info.ConflictingValues);
ConflictingSyncTypes = ConflictingSyncTypes.Union(info.ConflictingSyncTypes); ConflictingSyncTypes = ConflictingSyncTypes.Union(info.ConflictingSyncTypes);
ResolvedParameter.saved = ResolvedParameter.saved || info.ResolvedParameter.saved;
encounterOrder = Math.Min(encounterOrder, info.encounterOrder); encounterOrder = Math.Min(encounterOrder, info.encounterOrder);
} }
} }