Merge branch 'master' into 21249

# Conflicts: # libraries/audio-client/src/AudioClient.cpp

David Rowe committed 9 years ago

Commit 4a5f84f2 parents 7c2e1aa 8becca3365 files · +93445 −2421Browse files

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

Unified · Split

@@ -670,6 +670,7 @@ void ScriptEngine::init() { · 669 unmodified lines
670	globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE)));	670	globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE)));
671		671
672	registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data());	672	registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data());
		673	qScriptRegisterMetaType(this, tabletToScriptValue, tabletFromScriptValue);
673	registerGlobalObject("Assets", &_assetScriptingInterface);	674	registerGlobalObject("Assets", &_assetScriptingInterface);
674	registerGlobalObject("Resources", DependencyManager::get<ResourceScriptingInterface>().data());	675	registerGlobalObject("Resources", DependencyManager::get<ResourceScriptingInterface>().data());
675		676