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

Merge pull request #12462 from SamGondelman/entityDelete

Browse source 
Fix EntityItems not getting destroyed
This commit is contained in:
Sam Gondelman 2018-02-23 16:17:52 -08:00 committed by GitHub
commit e10af9b83d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/octree/OctreePacketProcessor.cpp
View file

@ -17,6 +17,8 @@
#include "SceneScriptingInterface.h" #include "SceneScriptingInterface.h"
OctreePacketProcessor::OctreePacketProcessor() { OctreePacketProcessor::OctreePacketProcessor() {
setObjectName("Octree Packet Processor");
auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver(); auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
packetReceiver.registerDirectListenerForTypes({ PacketType::OctreeStats, PacketType::EntityData, PacketType::EntityErase }, packetReceiver.registerDirectListenerForTypes({ PacketType::OctreeStats, PacketType::EntityData, PacketType::EntityErase },

1
libraries/entities/src/EntityTypes.cpp
View file

@ -97,6 +97,7 @@ EntityItemPointer EntityTypes::constructEntityItem(EntityType entityType, const
auto mutableProperties = properties; auto mutableProperties = properties;
mutableProperties.markAllChanged(); mutableProperties.markAllChanged();
newEntityItem = factory(entityID, mutableProperties); newEntityItem = factory(entityID, mutableProperties);
newEntityItem->moveToThread(qApp->thread());
} }
return newEntityItem; return newEntityItem;
} }