diff options
| author | qarmin <mikrutrafal54@gmail.com> | 2019-06-20 16:59:48 +0200 |
|---|---|---|
| committer | qarmin <mikrutrafal54@gmail.com> | 2019-06-20 16:59:48 +0200 |
| commit | 072e40368e19e0f88ec1fbb61fe463a6fffcca36 (patch) | |
| tree | 2a5c9383550dc22392bb210d5be570e1baa33fe2 /servers | |
| parent | 7a8dcb9a114d742f9bc1e269d738903c00729b8b (diff) | |
Fix always true/false values
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/physics/body_sw.cpp | 3 | ||||
| -rw-r--r-- | servers/physics/gjk_epa.cpp | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/servers/physics/body_sw.cpp b/servers/physics/body_sw.cpp index b4c3670a7b..172a2a3429 100644 --- a/servers/physics/body_sw.cpp +++ b/servers/physics/body_sw.cpp @@ -346,8 +346,7 @@ void BodySW::set_state(PhysicsServer::BodyState p_state, const Variant &p_varian //biased_angular_velocity=Vector3(); set_active(false); } else { - if (mode != PhysicsServer::BODY_MODE_STATIC) - set_active(true); + set_active(true); } } break; case PhysicsServer::BODY_STATE_CAN_SLEEP: { diff --git a/servers/physics/gjk_epa.cpp b/servers/physics/gjk_epa.cpp index ae512183fd..1d5ca42838 100644 --- a/servers/physics/gjk_epa.cpp +++ b/servers/physics/gjk_epa.cpp @@ -722,7 +722,10 @@ struct GJK append(m_stock,face); return(0); } - m_status=m_stock.root?eStatus::OutOfVertices:eStatus::OutOfFaces; + // -- GODOT start -- + //m_status=m_stock.root?eStatus::OutOfVertices:eStatus::OutOfFaces; + m_status=eStatus::OutOfFaces; + // -- GODOT end -- return(0); } sFace* findbest() |