History

Merge pull request #4128 from ZappoMan/master

fix double targets and freezing bullets

Andrew Meadows committed 11 years ago

Commit d5efc372 parents 81cd3e9 9a608961 file · +3 −0Browse files

Showing the changes to libraries/physics/src/EntityMotionState.cpp (1 of 1 file). Show all

Unified · Split

libraries/physics/src/EntityMotionState.cpp+3−0
@@ -163,6 +163,9 @@ float EntityMotionState::computeMass(const ShapeInfo& shapeInfo) const { · 162 unmodified lines
163 163
164void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_t frame) {164void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_t frame) {
165#ifdef USE_BULLET_PHYSICS165#ifdef USE_BULLET_PHYSICS
166 if (!_entity->isKnownID()) {
167 return; // never update entities that are unknown
168 }
166 if (_outgoingPacketFlags) {169 if (_outgoingPacketFlags) {
167 EntityItemProperties properties = _entity->getProperties();170 EntityItemProperties properties = _entity->getProperties();
168 171