Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-tool

Ryan Huffman committed 12 years ago

Commit bedd9c72 parents 3ec28f8 22dbebb122 files · +8102 −4443Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+1−1

@@ -290,7 +290,7 @@ void ScriptEngine::init() { · 289 unmodified lines
290	qScriptRegisterMetaType(this, animationDetailsToScriptValue, animationDetailsFromScriptValue);	290	qScriptRegisterMetaType(this, animationDetailsToScriptValue, animationDetailsFromScriptValue);
291		291
292	registerGlobalObject("Script", this);	292	registerGlobalObject("Script", this);
293	registerGlobalObject("Audio", &_audioScriptingInterface);	293	registerGlobalObject("Audio", &AudioScriptingInterface::getInstance());
294	registerGlobalObject("Controller", _controllerScriptingInterface);	294	registerGlobalObject("Controller", _controllerScriptingInterface);
295	registerGlobalObject("Entities", &_entityScriptingInterface);	295	registerGlobalObject("Entities", &_entityScriptingInterface);
296	registerGlobalObject("Quat", &_quatLibrary);	296	registerGlobalObject("Quat", &_quatLibrary);