History

Merge branch 'master' into scriptvec3

Sam Gondelman committed 8 years ago

Commit 67306352 parents 283c0c0 467fe56302 files · +4329 −3022Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+1−3
@@ -176,9 +176,7 @@ ScriptEngine::ScriptEngine(Context context, const QString& scriptContents, const · 175 unmodified lines
176 _timerFunctionMap(),176 _timerFunctionMap(),
177 _fileNameString(fileNameString),177 _fileNameString(fileNameString),
178 _arrayBufferClass(new ArrayBufferClass(this)),178 _arrayBufferClass(new ArrayBufferClass(this)),
179 _assetScriptingInterface(new AssetScriptingInterface(this)),179 _assetScriptingInterface(new AssetScriptingInterface(this))
180 // don't delete `ScriptEngines` until all `ScriptEngine`s are gone
181 _scriptEngines(DependencyManager::get<ScriptEngines>())
182{180{
183 switch (_context) {181 switch (_context) {
184 case Context::CLIENT_SCRIPT:182 case Context::CLIENT_SCRIPT: