Skip to content

Commit be9a881

Browse files
authored
Merge pull request scp-fs2open#1630 from niffiwan/bsp_opt
add small bsp tree optimisation
2 parents 78abbf8 + 8f2aec3 commit be9a881

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

code/model/modelread.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2851,10 +2851,11 @@ int model_load(const char *filename, int n_subsystems, model_subsystem *subsyst
28512851
TRACE_SCOPE(tracing::ModelParseAllBSPTrees);
28522852

28532853
for ( i = 0; i < pm->n_models; ++i ) {
2854-
pm->submodel[i].collision_tree_index = model_create_bsp_collision_tree();
2855-
bsp_collision_tree *tree = model_get_bsp_collision_tree(pm->submodel[i].collision_tree_index);
2856-
2857-
model_collide_parse_bsp(tree, pm->submodel[i].bsp_data, pm->version);
2854+
if ( !(pm->submodel[i].nocollide_this_only || pm->submodel[i].no_collisions) ) {
2855+
pm->submodel[i].collision_tree_index = model_create_bsp_collision_tree();
2856+
bsp_collision_tree *tree = model_get_bsp_collision_tree(pm->submodel[i].collision_tree_index);
2857+
model_collide_parse_bsp(tree, pm->submodel[i].bsp_data, pm->version);
2858+
}
28582859
}
28592860
}
28602861

0 commit comments

Comments
 (0)