Merge pull request #13555 from SamGondelman/destroy

Trying to fix dependency shutdown

John Conklin II committed 8 years ago

Commit 1edf1b42 parents 02f53c4 e3756a627 files · +294 −289Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 27 files). Show all

Unified · Split

@@ -1252,7 +1252,7 @@ bool EntityScriptingInterface::actionWorker(const QUuid& entityID, · 1251 unmodified lines
1252		1252
1253	EntityItemPointer entity;	1253	EntityItemPointer entity;
1254	bool doTransmit = false;	1254	bool doTransmit = false;
1255	_entityTree->withWriteLock([&] {	1255	_entityTree->withWriteLock([this, &entity, entityID, myNodeID, &doTransmit, actor, &properties] {
1256	EntitySimulationPointer simulation = _entityTree->getSimulation();	1256	EntitySimulationPointer simulation = _entityTree->getSimulation();
1257	entity = _entityTree->findEntityByEntityItemID(entityID);	1257	entity = _entityTree->findEntityByEntityItemID(entityID);
1258	if (!entity) {	1258	if (!entity) {

Keyboard shortcuts