Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix removed FGD bases creeping into final output through sorted_ents #34

Merged
merged 2 commits into from
Nov 11, 2024
Merged

Fix removed FGD bases creeping into final output through sorted_ents #34

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e811392
Allow sorted_ents to process entities with string bases
ozxybox Nov 11, 2024
9fa3f6b
Merge branch 'master' into fix-sorted-entities-export
TeamSpen210 Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/srctools/fgd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2122,9 +2122,7 @@ def sorted_ents(self) -> Iterator[EntityDef]:
for ent in todo:
ready = True
for base in ent.bases:
if isinstance(base, str):
raise ValueError(f'Unevaluated base: {base} in {ent.classname}!')
if base not in done:
if isinstance(base, EntityDef) and base not in done:
# Base not done yet, we need to defer this.
deferred.add(ent)
# If the base isn't in any of our sets, it's one
Expand Down