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

put back accidently deleted line. cleanups

Browse source
This commit is contained in:
Seth Alves 2016-04-04 17:31:59 -07:00
parent cecb3a6ff1
commit af05b97c1e
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities/src/EntityItem.cpp
View file

@ -1974,6 +1974,7 @@ QList<EntityActionPointer> EntityItem::getActionsOfType(EntityActionType typeToG
}
void EntityItem::locationChanged() {
requiresRecalcBoxes();
_dirtyFlags |= Simulation::DIRTY_TRANSFORM;
EntityTreePointer tree = getTree();
if (tree) {
@ -1988,6 +1989,7 @@ void EntityItem::dimensionsChanged() {
}
void EntityItem::globalizeProperties(EntityItemProperties& properties, const QString& messageTemplate, const glm::vec3& offset) const {
// TODO -- combine this with convertLocationToScriptSemantics
bool success;
auto globalPosition = getPosition(success);
if (success) {

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

@ -162,7 +162,7 @@ PhysicsMotionType EntityMotionState::computePhysicsMotionType() const {
return MOTION_TYPE_DYNAMIC;
}
if (_entity->isMovingRelativeToParent() ||
_entity->hasActions() ||
_entity->hasActions() ||
_entity->hasAncestorOfType(NestableType::Avatar)) {
return MOTION_TYPE_KINEMATIC;
}