Skip to content

Commit

Permalink
prefer ship tech model if it exists (#6499)
Browse files Browse the repository at this point in the history
  • Loading branch information
MjnMixael authored Jan 1, 2025
1 parent a8a9fea commit 369ed0f
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion code/model/modelrender.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3137,7 +3137,11 @@ bool render_tech_model(tech_render_type model_type, int x1, int y1, int x2, int
}

// Make sure model is loaded
model_num = model_load(sip->pof_file, sip->n_subsystems, &sip->subsystems[0], 0);
if (VALID_FNAME(sip->pof_file_tech)) {
model_num = model_load(sip->pof_file_tech, sip->n_subsystems, &sip->subsystems[0], 0);
} else {
model_num = model_load(sip->pof_file, sip->n_subsystems, &sip->subsystems[0], 0);
}
render_info.set_replacement_textures(model_num, sip->replacement_textures);

break;
Expand Down

0 comments on commit 369ed0f

Please sign in to comment.