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

resolve conflicts on merge with origin/protocol

Browse source
This commit is contained in:
Stephen Birarda 2015-07-17 11:10:30 -07:00
commit eaeaa23f03
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/avatars/src/AvatarData.cpp
View file

@ -386,7 +386,7 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) {
_headData->_leanSideways = leanSideways;
_headData->_torsoTwist = torsoTwist;
} // 6 bytes
{ // Lookat Position
glm::vec3 lookAt;
memcpy(&lookAt, sourceBuffer, sizeof(lookAt));