History

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

HifiExperiments committed 5 years ago

Commit 81940211 parent b39a8c95 files · +183 −109Browse 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+3−1
@@ -470,7 +470,9 @@ void EntityScriptServer::resetEntitiesScriptEngine() { · 469 unmodified lines
470470 scriptEngines->runScriptInitializers(newEngine);
471471 newEngine->runInThread();
472472 auto newEngineSP = qSharedPointerCast<EntitiesScriptEngineProvider>(newEngine);
473− DependencyManager::get<EntityScriptingInterface>()->setEntitiesScriptEngine(newEngineSP);
473+ // On the entity script server, these are the same
474+ DependencyManager::get<EntityScriptingInterface>()->setPersistentEntitiesScriptEngine(newEngineSP);
475+ DependencyManager::get<EntityScriptingInterface>()->setNonPersistentEntitiesScriptEngine(newEngineSP);
474476
475477 if (_entitiesScriptEngine) {
476478 disconnect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptDetailsUpdated,