History

Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo

Stephen Birarda committed 11 years ago

Commit 737741c2 parents a3cc578 61ec1bd103 files · +893 −542Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+1−2
@@ -94,7 +94,6 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNam · 93 unmodified lines
9494 _quatLibrary(),
9595 _vec3Library(),
9696 _uuidLibrary(),
97− _animationCache(this),
9897 _isUserLoaded(false),
9998 _arrayBufferClass(new ArrayBufferClass(this))
10099 {
@@ -256,7 +255,7 @@ void ScriptEngine::init() { · 155 unmodified lines
256255 registerGlobalObject("Quat", &_quatLibrary);
257256 registerGlobalObject("Vec3", &_vec3Library);
258257 registerGlobalObject("Uuid", &_uuidLibrary);
259− registerGlobalObject("AnimationCache", &_animationCache);
258+ registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCache>());
260259
261260 registerGlobalObject("Voxels", &_voxelsScriptingInterface);
262261