History

Merge pull request #14694 from danteruiz/delete-only-domain-entities

case 20595: case 20563: Do not delete local entities when switching domains.

John Conklin II committed 7 years ago

Commit 45ec4442 parents f955313 4ab730814 files · +200 −25Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 14 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+5−0
@@ -2407,6 +2407,11 @@ void ScriptEngine::unloadEntityScript(const EntityItemID& entityID, bool shouldR · 2406 unmodified lines
2407 }2407 }
2408}2408}
2409 2409
2410QList<EntityItemID> ScriptEngine::getListOfEntityScriptIDs() {
2411 QReadLocker locker{ &_entityScriptsLock };
2412 return _entityScripts.keys();
2413}
2414
2410void ScriptEngine::unloadAllEntityScripts() {2415void ScriptEngine::unloadAllEntityScripts() {
2411 if (QThread::currentThread() != thread()) {2416 if (QThread::currentThread() != thread()) {
2412#ifdef THREAD_DEBUGGING2417#ifdef THREAD_DEBUGGING