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

Merge pull request #15495 from Atlante45/fix/deadlock

Browse source 
Case 22433: master: Query shape type outside lock
This commit is contained in:
Shannon Romano 2019-05-06 14:12:56 -07:00 committed by GitHub
commit 5a603c20aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2023,9 +2023,10 @@ void EntityItem::setCollisionMask(uint16_t value) {
void EntityItem::setDynamic(bool value) { void EntityItem::setDynamic(bool value) {
if (getDynamic() != value) { if (getDynamic() != value) {
auto shapeType = getShapeType();
withWriteLock([&] { withWriteLock([&] {
// dynamic and STATIC_MESH are incompatible so we check for that case // dynamic and STATIC_MESH are incompatible so we check for that case
if (value && getShapeType() == SHAPE_TYPE_STATIC_MESH) { if (value && shapeType == SHAPE_TYPE_STATIC_MESH) {
if (_dynamic) { if (_dynamic) {
_dynamic = false; _dynamic = false;
_flags |= Simulation::DIRTY_MOTION_TYPE; _flags |= Simulation::DIRTY_MOTION_TYPE;

1
libraries/networking/src/udt/PacketHeaders.h
View file

@ -269,6 +269,7 @@ enum class EntityVersion : PacketVersion {
CertificateTypeProperty, CertificateTypeProperty,
DisableWebMedia, DisableWebMedia,
ParticleShapeType, ParticleShapeType,
ParticleShapeTypeDeadlockFix,
// Add new versions above here // Add new versions above here
NUM_PACKET_TYPE, NUM_PACKET_TYPE,