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

Stephen Birarda committed 11 years ago

Commit 9425ea22 parents adf51bf 1617d7978 files · +580 −577Browse files

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

Unified · Split

@@ -255,7 +255,7 @@ void ScriptEngine::init() { · 254 unmodified lines
255	255	registerGlobalObject("Quat", &_quatLibrary);
256	256	registerGlobalObject("Vec3", &_vec3Library);
257	257	registerGlobalObject("Uuid", &_uuidLibrary);
258		− registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCache>());
	258	+ registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCache>().data());
259	259
260	260	registerGlobalObject("Voxels", &_voxelsScriptingInterface);
261	261