Skip to content

Add safeguards for invalidated model instances #7521

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

Closed
BMagnu wants to merge 2 commits into from
+9 −1
Closed

Add safeguards for invalidated model instances #7521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29282c2
Add safeguards for invalidated model instances and texture replace sp…
BMagnu Jun 13, 2026
5d6cbab
More guards
BMagnu Jun 13, 2026
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
6 changes: 5 additions & 1 deletion code/model/modelrender.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3195,8 +3195,12 @@ void model_render_set_wireframe_color(const color* clr)

void modelinstance_replace_active_texture(polymodel_instance* pmi, const char* old_name, const char* new_name)
{
Assert(pmi != nullptr);
if (pmi == nullptr)
return;

polymodel* pm = model_get(pmi->model_num);
if (pm == nullptr)
return;

int final_index = -1;

Expand Down
4 changes: 4 additions & 0 deletions code/ship/ship.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8986,6 +8986,7 @@ void ship_delete( object * obj )
ct_ship_delete(shipp);

model_delete_instance(shipp->model_instance_num);
shipp->model_instance_num = -1;

// free up any weapon model instances
for (int i = 0; i < shipp->weapons.num_primary_banks; ++i)
Expand Down Expand Up @@ -19697,6 +19698,9 @@ void ship_page_out_textures(int ship_index, bool release)

void ship_replace_active_texture(int ship_index, const char* old_name, const char* new_name)
{
if (Ships[ship_index].model_instance_num < 0)
return;

polymodel_instance* pmi = model_get_instance(Ships[ship_index].model_instance_num);
modelinstance_replace_active_texture(pmi, old_name, new_name);
}
Expand Down
Loading