From af05b97c1e9418a727053c155875d8085ab8c78e Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 4 Apr 2016 17:31:59 -0700 Subject: [PATCH] put back accidently deleted line. cleanups --- libraries/entities/src/EntityItem.cpp | 2 ++ libraries/physics/src/EntityMotionState.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index acdcc4a8a2..17b4e6a87d 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -1974,6 +1974,7 @@ QList 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) { diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp index 6f6094c99b..700160514c 100644 --- a/libraries/physics/src/EntityMotionState.cpp +++ b/libraries/physics/src/EntityMotionState.cpp @@ -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; }