Merge branch 'master' of https://github.com/highfidelity/hifi into mesh-through-mixer

Stephen Birarda committed 12 years ago

Commit 45544202 parents 7ceacd2 e78a40a49 files · +2562 −539Browse files

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

Unified · Split

@@ -138,6 +138,7 @@ void ScriptEngine::init() { · 137 unmodified lines
138	registerGlobalObject("Controller", _controllerScriptingInterface);	138	registerGlobalObject("Controller", _controllerScriptingInterface);
139	registerGlobalObject("Particles", &_particlesScriptingInterface);	139	registerGlobalObject("Particles", &_particlesScriptingInterface);
140	registerGlobalObject("Quat", &_quatLibrary);	140	registerGlobalObject("Quat", &_quatLibrary);
		141	registerGlobalObject("Vec3", &_vec3Library);
141		142
142	registerGlobalObject("Voxels", &_voxelsScriptingInterface);	143	registerGlobalObject("Voxels", &_voxelsScriptingInterface);
143		144