Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13159 from sethalves/fix-action-assert

Browse source 
don't assert when unserializing a 'spring' action
This commit is contained in:
Seth Alves 2018-05-11 15:15:51 -07:00 committed by GitHub
commit ca56449c1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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/ObjectActionTractor.cpp
View file

@ -397,7 +397,7 @@ void ObjectActionTractor::deserialize(QByteArray serializedArguments) {
EntityDynamicType type;
dataStream >> type;
assert(type == getType());
assert(type == getType() || type == DYNAMIC_TYPE_SPRING);
QUuid id;
dataStream >> id;