History

further unmangle branch split

Seth Alves committed 11 years ago

Commit 64c5cde1 parent a78728c2 files · +5 −0Browse files

Showing the changes to libraries/physics/src/ObjectActionSpring.cpp (1 of 2 files). Show all

Unified · Split

libraries/physics/src/ObjectActionSpring.cpp+1−0
@@ -219,6 +219,7 @@ void ObjectActionSpring::deserialize(QByteArray serializedArguments) { · 218 unmodified lines
219 uint16_t serializationVersion;219 uint16_t serializationVersion;
220 dataStream >> serializationVersion;220 dataStream >> serializationVersion;
221 if (serializationVersion != ObjectActionSpring::springVersion) {221 if (serializationVersion != ObjectActionSpring::springVersion) {
222 assert(false);
222 return;223 return;
223 }224 }
224 225