Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 21:12:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
Howard Stearns 2015-07-13 13:19:39 -07:00
commit 8ddbe139a7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/physics/src/ObjectActionSpring.cpp
View file

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