Merge branch 'master' of https://github.com/highfidelity/hifi into remove-octreeFades

This commit is contained in:
Howard Stearns 2015-07-13 13:19:39 -07:00
commit 8ddbe139a7

View file

@ -189,7 +189,7 @@ void ObjectActionSpring::deserialize(QByteArray serializedArguments) {
EntityActionType type;
dataStream >> type;
assert(type == ACTION_TYPE_SPRING);
assert(type == getType());
QUuid id;
dataStream >> id;