Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 02:52:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

address CR feedback

Browse source
This commit is contained in:
Livi Erickson 2018-05-20 18:22:17 -07:00
parent 9c0084209b
commit 9f7b383757
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/entities/src/EntityTree.cpp
View file

@ -1457,12 +1457,13 @@ int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned c
if (isClone) { if (isClone) {
QByteArray buffer = QByteArray::fromRawData(reinterpret_cast<const char*>(editData), maxLength); QByteArray buffer = QByteArray::fromRawData(reinterpret_cast<const char*>(editData), maxLength);
validEditPacket = EntityItemProperties::decodeCloneEntityMessage(buffer, processedBytes, entityIDToClone, entityItemID); validEditPacket = EntityItemProperties::decodeCloneEntityMessage(buffer, processedBytes, entityIDToClone, entityItemID);
entityToClone = findEntityByEntityItemID(entityIDToClone); if (validEditPacket) {
if (entityToClone) { entityToClone = findEntityByEntityItemID(entityIDToClone);
properties = entityToClone->getProperties(); if (entityToClone) {
properties = entityToClone->getProperties();
}
} }
} } else {
else {
validEditPacket = EntityItemProperties::decodeEntityEditPacket(editData, maxLength, processedBytes, entityItemID, properties); validEditPacket = EntityItemProperties::decodeEntityEditPacket(editData, maxLength, processedBytes, entityItemID, properties);
} }