Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 06:16:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

back out a couple other unneeded changes

Browse source
This commit is contained in:
Seth Alves 2015-10-01 18:21:53 -07:00
parent 40c5103d2f
commit 9f27e5ff1f
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1606,7 +1606,6 @@ bool EntityItem::clearActions(EntitySimulation* simulation) {
_actionsToRemove.clear(); _actionsToRemove.clear();
_allActionsDataCache.clear(); _allActionsDataCache.clear();
_dirtyFlags |= EntityItem::DIRTY_PHYSICS_ACTIVATION; _dirtyFlags |= EntityItem::DIRTY_PHYSICS_ACTIVATION;
_actionDataDirty = true;
}); });
return true; return true;
} }
@ -1719,10 +1718,8 @@ void EntityItem::setActionData(QByteArray actionData) {
void EntityItem::setActionDataInternal(QByteArray actionData) { void EntityItem::setActionDataInternal(QByteArray actionData) {
assertWriteLocked(); assertWriteLocked();
checkWaitingToRemove(); checkWaitingToRemove();
if (_allActionsDataCache != actionData) { _allActionsDataCache = actionData;
_allActionsDataCache = actionData; deserializeActionsInternal();
deserializeActionsInternal();
}
} }
QByteArray EntityItem::serializeActions(bool& success) const { QByteArray EntityItem::serializeActions(bool& success) const {