diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-22 12:00:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-22 12:00:34 +0200 |
| commit | a342131eba2834240289112a1b8d5d0c68a265c9 (patch) | |
| tree | c412df9c24c8b568086ea6ff72a097fb8d20dbc0 /servers/physics | |
| parent | 1e67f214c520b2c1a9fed30f78440c4e1d4d14dd (diff) | |
| parent | 856a8226a5306632f5dd4d9e9c916d89e3e21495 (diff) | |
Merge pull request #27673 from qarmin/small_fixes
Small fixes, mostly duplicated code
Diffstat (limited to 'servers/physics')
| -rw-r--r-- | servers/physics/space_sw.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/servers/physics/space_sw.cpp b/servers/physics/space_sw.cpp index 4ab92715f4..e52cc376c0 100644 --- a/servers/physics/space_sw.cpp +++ b/servers/physics/space_sw.cpp @@ -351,10 +351,8 @@ bool PhysicsDirectSpaceStateSW::collide_shape(RID p_shape, const Transform &p_sh CollisionSolverSW::CallbackResult cbkres = NULL; PhysicsServerSW::CollCbkData *cbkptr = NULL; - if (p_result_max > 0) { - cbkptr = &cbk; - cbkres = PhysicsServerSW::_shape_col_cbk; - } + cbkptr = &cbk; + cbkres = PhysicsServerSW::_shape_col_cbk; for (int i = 0; i < amount; i++) { |