Skip to content

more robust handling of modelinstance teardown#7522

Merged
Goober5000 merged 1 commit into
scp-fs2open:masterfrom
Goober5000:fix/modelinstance_teardown
Jun 13, 2026
Merged

more robust handling of modelinstance teardown#7522
Goober5000 merged 1 commit into
scp-fs2open:masterfrom
Goober5000:fix/modelinstance_teardown

Conversation

@Goober5000

Copy link
Copy Markdown
Contributor

Set model instances to -1 when objects are deleted, and guard against null model instances in modelinstance_replace_active_texture. This may fix a crash in Event Horizon.

Set model instances to -1 when objects are deleted, and guard against null model instances in `modelinstance_replace_active_texture`.  This may fix a crash in Event Horizon.
@Goober5000 Goober5000 added cleanup A modification or rewrite of code to make it more understandable or easier to maintain. fix A fix for bugs, not-a-bugs, and/or regressions. labels Jun 13, 2026
Comment thread code/model/modelrender.cpp
@Goober5000 Goober5000 merged commit 741693a into scp-fs2open:master Jun 13, 2026
20 checks passed
@Goober5000 Goober5000 deleted the fix/modelinstance_teardown branch June 13, 2026 05:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cleanup A modification or rewrite of code to make it more understandable or easier to maintain. fix A fix for bugs, not-a-bugs, and/or regressions.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants