File tree Expand file tree Collapse file tree 1 file changed +10
-10
lines changed Expand file tree Collapse file tree 1 file changed +10
-10
lines changed Original file line number Diff line number Diff line change @@ -1236,16 +1236,6 @@ void IVP_Mindist::do_impact(){
1236
1236
}
1237
1237
1238
1238
g_pCurrentMindist = NULL ;
1239
- if (g_fDeferDeleteMindist)
1240
- {
1241
- // BUGBUG: someone changed a collision filter and didn't tell us!
1242
- // Calling recheck_collision_filter should fix it and stop it from breaking the entire engine. (Never call "delete this;" here).
1243
- // In most cases, this IVP_Mindist will also be deleted from recheck_collision_filter.
1244
- for (int i = 0 ;i<2 ;i++){
1245
- objects[i]->recheck_collision_filter ();
1246
- }
1247
- return ;
1248
- }
1249
1239
1250
1240
// revive_object_core is calling start_memory_transaction and end_memory_transaction, so we cannot start memory transaction earlier
1251
1241
env->sim_unit_mem ->start_memory_transaction ();
@@ -1261,6 +1251,16 @@ void IVP_Mindist::do_impact(){
1261
1251
1262
1252
IVP_Impact_Solver_Long_Term::do_impact_of_two_objects (this , objects[0 ], objects[1 ] );
1263
1253
env->sim_unit_mem ->end_memory_transaction ();
1254
+
1255
+ if (g_fDeferDeleteMindist)
1256
+ {
1257
+ // BUGBUG: someone changed a collision filter and didn't tell us!
1258
+ // Calling recheck_collision_filter should fix it and stop it from breaking the entire engine. (Never call "delete this;" here).
1259
+ // In most cases, this IVP_Mindist will also be deleted from recheck_collision_filter.
1260
+ for (int i = 0 ;i<2 ;i++){
1261
+ objects[i]->recheck_collision_filter ();
1262
+ }
1263
+ }
1264
1264
}
1265
1265
1266
1266
// find second critical core for core0 that is not core1
You can’t perform that action at this time.
0 commit comments