History

crash fix

Dante Ruiz committed 9 years ago

Commit 1ec40811 parent b2a11aa3 files · +22 −8Browse files

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

Unified · Split

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