diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index 4bf38070c4..4fcd39d819 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -190,7 +190,6 @@ ScriptEngine::ScriptEngine(Context context, const QString& scriptContents, const case Context::ENTITY_SERVER_SCRIPT: _type = Type::ENTITY_SERVER; break; - case Context::EDIT_FILTER_SCRIPT: case Context::AGENT_SCRIPT: _type = Type::AGENT; break; diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h index bca3e02a96..b86d8f6315 100644 --- a/libraries/script-engine/src/ScriptEngine.h +++ b/libraries/script-engine/src/ScriptEngine.h @@ -130,8 +130,7 @@ public: CLIENT_SCRIPT, ENTITY_CLIENT_SCRIPT, ENTITY_SERVER_SCRIPT, - AGENT_SCRIPT, - EDIT_FILTER_SCRIPT + AGENT_SCRIPT }; enum Type { diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp index 05eefc66df..17f79574b9 100644 --- a/libraries/script-engine/src/ScriptEngines.cpp +++ b/libraries/script-engine/src/ScriptEngines.cpp @@ -542,9 +542,7 @@ void ScriptEngines::quitWhenFinished() { int ScriptEngines::runScriptInitializers(ScriptEnginePointer scriptEngine) { auto nativeCount = DependencyManager::get()->runScriptInitializers(scriptEngine.data()); - return nativeCount + std::count_if(_scriptInitializers.begin(), _scriptInitializers.end(), - [scriptEngine](auto initializer){ initializer(scriptEngine); return true; } - ); + return nativeCount + ScriptInitializerMixin::runScriptInitializers(scriptEngine); } void ScriptEngines::launchScriptEngine(ScriptEnginePointer scriptEngine) { diff --git a/plugins/KasenAPIExample/CMakeLists.txt b/plugins/KasenAPIExample/CMakeLists.txt index 51406fbd45..14e2dc0b3d 100644 --- a/plugins/KasenAPIExample/CMakeLists.txt +++ b/plugins/KasenAPIExample/CMakeLists.txt @@ -1,7 +1,3 @@ set(TARGET_NAME KasenAPIExample) setup_hifi_client_server_plugin() link_hifi_libraries(shared plugins avatars networking graphics gpu) - -if (BUILD_SERVER) - install_beside_console() -endif() diff --git a/plugins/KasenAPIExample/src/KasenAPIExample.cpp b/plugins/KasenAPIExample/src/KasenAPIExample.cpp index f6823ebded..f781c0be28 100644 --- a/plugins/KasenAPIExample/src/KasenAPIExample.cpp +++ b/plugins/KasenAPIExample/src/KasenAPIExample.cpp @@ -105,7 +105,7 @@ private: static QVariantMap zipNonZeroValues(const QStringList& keys, const QVector& values) { QVariantMap out; for (int i=1; i < values.size(); i++) { - if (fabs(values[i]) > 1.0e-6f) { + if (fabs(values[i]) > 1.0e-6) { out[keys.value(i)] = values[i]; } }