mirror of
https://github.com/bdunderscore/modular-avatar.git
synced 2025-04-09 14:09:00 +08:00
Fix nested parameter saved setting (#1130)
* fix: child parameters should not override parent saved setting * fix: sibling parameters can override sibling saved setting
This commit is contained in:
parent
1163fac2e7
commit
566a030730
@ -115,7 +115,7 @@ namespace nadena.dev.modular_avatar.core.editor
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
ResolvedParameter.saved |= info.ResolvedParameter.saved;
|
||||
}
|
||||
|
||||
public void MergeChild(ParameterInfo info)
|
||||
@ -128,8 +128,6 @@ namespace nadena.dev.modular_avatar.core.editor
|
||||
ResolvedParameter.hasExplicitDefaultValue = info.ResolvedParameter.hasExplicitDefaultValue;
|
||||
ResolvedParameter.m_overrideAnimatorDefaults = info.ResolvedParameter.m_overrideAnimatorDefaults;
|
||||
}
|
||||
|
||||
ResolvedParameter.saved = info.ResolvedParameter.saved;
|
||||
}
|
||||
|
||||
void MergeCommon(ParameterInfo info)
|
||||
@ -154,8 +152,6 @@ namespace nadena.dev.modular_avatar.core.editor
|
||||
ConflictingValues = ConflictingValues.Union(info.ConflictingValues);
|
||||
ConflictingSyncTypes = ConflictingSyncTypes.Union(info.ConflictingSyncTypes);
|
||||
|
||||
ResolvedParameter.saved = ResolvedParameter.saved || info.ResolvedParameter.saved;
|
||||
|
||||
encounterOrder = Math.Min(encounterOrder, info.encounterOrder);
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user