Skip to content
This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

ASList merger update #474

Merged
merged 8 commits into from
Dec 26, 2022
Merged

Conversation

GingerAvalanche
Copy link
Collaborator

  • CFDefine differ/merger, updates each CFDefine's data based on which CFPre is contained inside it
    • Fixes differ logging the entire CFDefines section (works with old logs - will "update" each CFDefine param to the same value it already had)
  • ASDefine merger fix x2
    • Leaves existing ASDefine list in place, keeping the references it owns from being destroyed while being owned by another list
    • Copies SafeString contents, instead of the SafeString reference, so underlying data isn't destroyed if the Parameter owning that SafeString gets destroyed (which shouldn't happen because the vanilla ASDefine is no longer destroyed)
  • Minor shop merger update: Don't log a table name if the table the corresponding table has no values/doesn't get attached

Leave the original ParameterList, and create a lookup list to preserve merging speed
Preserves insertion ordering of values
SafeString is just a container, so storing it causes pybind to destroy the contained string when the Filename gets overwritten. Now we copy the string before it gets destroyed
Clarifies CFDefine diffing and merging
@GingerAvalanche GingerAvalanche merged commit 013b1bb into NiceneNerd:master Dec 26, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant