From 9f27e5ff1fb260bc313fd8c9c08775ab8eae47f9 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 1 Oct 2015 18:21:53 -0700 Subject: [PATCH] back out a couple other unneeded changes --- libraries/entities/src/EntityItem.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index 2c18ac5cfd..87967629dd 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -1606,7 +1606,6 @@ bool EntityItem::clearActions(EntitySimulation* simulation) { _actionsToRemove.clear(); _allActionsDataCache.clear(); _dirtyFlags |= EntityItem::DIRTY_PHYSICS_ACTIVATION; - _actionDataDirty = true; }); return true; } @@ -1719,10 +1718,8 @@ void EntityItem::setActionData(QByteArray actionData) { void EntityItem::setActionDataInternal(QByteArray actionData) { assertWriteLocked(); checkWaitingToRemove(); - if (_allActionsDataCache != actionData) { - _allActionsDataCache = actionData; - deserializeActionsInternal(); - } + _allActionsDataCache = actionData; + deserializeActionsInternal(); } QByteArray EntityItem::serializeActions(bool& success) const {