diff --git a/interface/src/avatar/AvatarActionHold.h b/interface/src/avatar/AvatarActionHold.h index ff8d32891b..3cc70ced09 100644 --- a/interface/src/avatar/AvatarActionHold.h +++ b/interface/src/avatar/AvatarActionHold.h @@ -30,7 +30,7 @@ public: QByteArray serialize() const; virtual void deserialize(QByteArray serializedArguments); - virtual bool shouldSuppressEdits() { return true; } + virtual bool shouldSuppressLocationEdits() { return true; } private: static const uint16_t holdVersion; diff --git a/libraries/entities/src/EntityActionInterface.h b/libraries/entities/src/EntityActionInterface.h index 957071bd42..44c269f336 100644 --- a/libraries/entities/src/EntityActionInterface.h +++ b/libraries/entities/src/EntityActionInterface.h @@ -51,7 +51,7 @@ public: bool locallyAddedButNotYetReceived = false; - virtual bool shouldSuppressEdits() { return false; } + virtual bool shouldSuppressLocationEdits() { return false; } protected: virtual glm::vec3 getPosition() = 0; diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index c9c431fd32..5b72ac62c1 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -1791,10 +1791,10 @@ QVariantMap EntityItem::getActionArguments(const QUuid& actionID) const { return result; } -bool EntityItem::shouldSuppressEdits() const { +bool EntityItem::shouldSuppressLocationEdits() const { QHash::const_iterator i = _objectActions.begin(); while (i != _objectActions.end()) { - if (i.value()->shouldSuppressEdits()) { + if (i.value()->shouldSuppressLocationEdits()) { return true; } i++; diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h index 59651bfaf0..cc8fa6c00d 100644 --- a/libraries/entities/src/EntityItem.h +++ b/libraries/entities/src/EntityItem.h @@ -424,7 +424,7 @@ public: QVariantMap getActionArguments(const QUuid& actionID) const; void deserializeActions(); void setActionDataDirty(bool value) const { _actionDataDirty = value; } - bool shouldSuppressEdits() const; + bool shouldSuppressLocationEdits() const; protected: diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp index 5cfdd4125f..2621347373 100644 --- a/libraries/physics/src/EntityMotionState.cpp +++ b/libraries/physics/src/EntityMotionState.cpp @@ -291,7 +291,7 @@ bool EntityMotionState::remoteSimulationOutOfSync(uint32_t simulationStep) { return true; } - if (_entity->shouldSuppressEdits()) { + if (_entity->shouldSuppressLocationEdits()) { return false; }