Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 14:58:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

formatting, re-enable code that causes an interface to attempt to claim a moving object with no current simulation-owner

Browse source
This commit is contained in:
Seth Alves 2015-04-25 06:56:19 -07:00
parent ac46f84291
commit 48ec0c8339
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -681,7 +681,6 @@ void EntityTreeRenderer::renderElement(OctreeElement* element, RenderArgs* args)
if (entityItem->getGlowLevel() > 0.0f) { if (entityItem->getGlowLevel() > 0.0f) {
glower = new Glower(entityItem->getGlowLevel()); glower = new Glower(entityItem->getGlowLevel());
} }
entityItem->render(args); entityItem->render(args);
args->_itemsRendered++; args->_itemsRendered++;
if (glower) { if (glower) {

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

@ -116,7 +116,7 @@ void EntityMotionState::setWorldTransform(const btTransform& worldTrans) {
if (_entity->getSimulatorID().isNull() && isMoving()) { if (_entity->getSimulatorID().isNull() && isMoving()) {
// object is moving and has no owner. attempt to claim simulation ownership. // object is moving and has no owner. attempt to claim simulation ownership.
// setShouldClaimSimulationOwnership(true); setShouldClaimSimulationOwnership(true);
} }
_outgoingPacketFlags = DIRTY_PHYSICS_FLAGS; _outgoingPacketFlags = DIRTY_PHYSICS_FLAGS;