History

Merge pull request #4535 from ZappoMan/scriptCaching

Script caching & Fix to Stack Overflow Crash on Windows with lots of entity scripts

Philip Rosedale committed 11 years ago

Commit ce05d312 parents e1da933 31072b27 files · +184 −47Browse files

Showing the changes to interface/src/Application.cpp (1 of 7 files). Show all

Unified · Split

interface/src/Application.cpp+3−3
@@ -76,7 +76,7 @@ · 75 unmodified lines
7676 #include <PhysicsEngine.h>
7777 #include <ProgramObject.h>
7878 #include <ResourceCache.h>
79−//#include <ScriptCache.h>
79+#include <ScriptCache.h>
8080 #include <SettingHandle.h>
8181 #include <SoundCache.h>
8282 #include <TextRenderer.h>
@@ -221,7 +221,7 @@ bool setupEssentials(int& argc, char** argv) { · 138 unmodified lines
221221 auto addressManager = DependencyManager::set<AddressManager>();
222222 auto nodeList = DependencyManager::set<NodeList>(NodeType::Agent, listenPort);
223223 auto geometryCache = DependencyManager::set<GeometryCache>();
224− //auto scriptCache = DependencyManager::set<ScriptCache>();
224+ auto scriptCache = DependencyManager::set<ScriptCache>();
225225 auto soundCache = DependencyManager::set<SoundCache>();
226226 auto glowEffect = DependencyManager::set<GlowEffect>();
227227 auto faceshift = DependencyManager::set<Faceshift>();
@@ -620,7 +620,7 @@ Application::~Application() { · 392 unmodified lines
620620 DependencyManager::destroy<AnimationCache>();
621621 DependencyManager::destroy<TextureCache>();
622622 DependencyManager::destroy<GeometryCache>();
623− //DependencyManager::destroy<ScriptCache>();
623+ DependencyManager::destroy<ScriptCache>();
624624 DependencyManager::destroy<SoundCache>();
625625
626626 QThread* nodeThread = DependencyManager::get<NodeList>()->thread();