History

Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine"

kasenvr committed 5 years ago

Commit 21f8eac1 parent c3439a85 files · +109 −183Browse files

Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 5 files). Show all

Unified · Split

assignment-client/src/scripts/EntityScriptServer.cpp+1−3
@@ -470,9 +470,7 @@ void EntityScriptServer::resetEntitiesScriptEngine() { · 469 unmodified lines
470 scriptEngines->runScriptInitializers(newEngine);470 scriptEngines->runScriptInitializers(newEngine);
471 newEngine->runInThread();471 newEngine->runInThread();
472 auto newEngineSP = qSharedPointerCast<EntitiesScriptEngineProvider>(newEngine);472 auto newEngineSP = qSharedPointerCast<EntitiesScriptEngineProvider>(newEngine);
473 // On the entity script server, these are the same473 DependencyManager::get<EntityScriptingInterface>()->setEntitiesScriptEngine(newEngineSP);
474 DependencyManager::get<EntityScriptingInterface>()->setPersistentEntitiesScriptEngine(newEngineSP);
475 DependencyManager::get<EntityScriptingInterface>()->setNonPersistentEntitiesScriptEngine(newEngineSP);
476 474
477 if (_entitiesScriptEngine) {475 if (_entitiesScriptEngine) {
478 disconnect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptDetailsUpdated,476 disconnect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptDetailsUpdated,