Showing the changes to interface/src/octree/OctreePacketProcessor.cpp (1 of 1 file). Show all
Unified · Split
| @@ -1,4 +1,4 @@ | ||
| 1 | −// | |
| 1 | +/Merge branch 'master' of ssh://github.com/highfidelity/hifi into isentropic/ | |
| 2 | 2 | // OctreePacketProcessor.cpp |
| 3 | 3 | // interface/src/octree |
| 4 | 4 | // |
| @@ -59,9 +59,7 @@ void OctreePacketProcessor::processPacket(const SharedNodePointer& sendingNode, · 54 unmodified lines | ||
| 59 | 59 | PacketVersion expectedVersion = versionForPacketType(voxelPacketType); |
| 60 | 60 | |
| 61 | 61 | // check version of piggyback packet against expected version |
| 62 | − if (packetVersion != expectedVersion | |
| 63 | − // TODO: remove the temporary exception below when everyone is using meters instead of DomainUnits | |
| 64 | − && !(PacketTypeEntityData == voxelPacketType && packetVersion < VERSION_ENTITIES_USE_METERS_AND_RADIANS)) { | |
| 62 | + if (packetVersion != expectedVersion) { | |
| 65 | 63 | static QMultiMap<QUuid, PacketType> versionDebugSuppressMap; |
| 66 | 64 | |
| 67 | 65 | QUuid senderUUID = uuidFromPacketHeader(packet); |