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

fix logic that resets own-avatar collisions after a parenting grab is released

Browse source
This commit is contained in:
Seth Alves 2017-12-18 17:30:56 -08:00
parent 3a55fcfaf5
commit ca45c4e8da
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/entities/src/EntityItem.cpp
View file

@ -1634,6 +1634,10 @@ void EntityItem::setParentID(const QUuid& value) {
newParentNoBootstrapping |= Simulation::NO_BOOTSTRAPPING; newParentNoBootstrapping |= Simulation::NO_BOOTSTRAPPING;
} }
if (!oldParentID.isNull() && (oldParentID == Physics::getSessionUUID() || oldParentID == AVATAR_SELF_ID)) {
oldParentNoBootstrapping |= Simulation::NO_BOOTSTRAPPING;
}
if ((bool)(oldParentNoBootstrapping ^ newParentNoBootstrapping)) { if ((bool)(oldParentNoBootstrapping ^ newParentNoBootstrapping)) {
if ((bool)(newParentNoBootstrapping & Simulation::NO_BOOTSTRAPPING)) { if ((bool)(newParentNoBootstrapping & Simulation::NO_BOOTSTRAPPING)) {
markDirtyFlags(Simulation::NO_BOOTSTRAPPING); markDirtyFlags(Simulation::NO_BOOTSTRAPPING);