Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-08 10:17:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge upstream/master into andrew/bispinor

Browse source 
Conflicts:
	libraries/physics/src/EntityMotionState.cpp
This commit is contained in:
Andrew Meadows 2015-01-16 15:22:06 -08:00
commit 840acecbe6
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

@ -154,6 +154,9 @@ float EntityMotionState::computeMass(const ShapeInfo& shapeInfo) const {
} }
void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_t frame) { void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_t frame) {
if (!_entity->isKnownID()) {
return; // never update entities that are unknown
}
if (_outgoingPacketFlags) { if (_outgoingPacketFlags) {
EntityItemProperties properties = _entity->getProperties(); EntityItemProperties properties = _entity->getProperties();