Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-10 19:29:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10521 from sethalves/fix-locked-in-motion

Browse source 
if something is locked but in motion, make it kinematic rather than static
This commit is contained in:
Brad Hefta-Gaub 2017-05-25 08:32:30 -07:00 committed by GitHub
commit 23af6294ab
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/physics/src/EntityMotionState.cpp
View file

@ -186,6 +186,9 @@ PhysicsMotionType EntityMotionState::computePhysicsMotionType() const {
}
if (_entity->getLocked()) {
if (_entity->isMoving()) {
return MOTION_TYPE_KINEMATIC;
}
return MOTION_TYPE_STATIC;
}