Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-27 12:50:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't allow null Physics::sessionUUID

Browse source
This commit is contained in:
Andrew Meadows 2019-09-27 14:08:11 -07:00
parent aef8ac6bf0
commit 5a81ed73fe
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/shared/src/PhysicsHelpers.cpp
View file

@ -10,10 +10,12 @@
// //
#include "PhysicsHelpers.h" #include "PhysicsHelpers.h"
#include "NumericalConstants.h"
#include <QUuid> #include <QUuid>
#include "NumericalConstants.h"
#include "PhysicsCollisionGroups.h" #include "PhysicsCollisionGroups.h"
#include "SharedUtil.h"
// This chunk of code was copied from Bullet-2.82, so we include the Bullet license here: // This chunk of code was copied from Bullet-2.82, so we include the Bullet license here:
/* /*
@ -91,7 +93,7 @@ int32_t Physics::getDefaultCollisionMask(int32_t group) {
QUuid _sessionID; QUuid _sessionID;
void Physics::setSessionUUID(const QUuid& sessionID) { void Physics::setSessionUUID(const QUuid& sessionID) {
_sessionID = sessionID; _sessionID = sessionID.isNull() ? AVATAR_SELF_ID : sessionID;
} }
const QUuid& Physics::getSessionUUID() { const QUuid& Physics::getSessionUUID() {