History

Couple bug fixes

Atlante45 committed 10 years ago

Commit 548d8261 parent 7d7a6835 files · +10 −16Browse files

Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all

Unified · Split

interface/src/Application.cpp+1−2
@@ -426,7 +426,6 @@ bool setupEssentials(int& argc, char** argv) { · 425 unmodified lines
426426 DependencyManager::set<MessagesClient>();
427427 DependencyManager::set<UserInputMapper>();
428428 DependencyManager::set<controller::ScriptingInterface, ControllerScriptingInterface>();
429− DependencyManager::set<AssetMappingsScriptingInterface>();
430429 DependencyManager::set<InterfaceParentFinder>();
431430 DependencyManager::set<EntityTreeRenderer>(true, qApp, qApp);
432431 DependencyManager::set<CompositorHelper>();
@@ -1296,7 +1295,7 @@ void Application::initializeUi() { · 863 unmodified lines
12961295 rootContext->setContextProperty("Quat", new Quat());
12971296 rootContext->setContextProperty("Vec3", new Vec3());
12981297 rootContext->setContextProperty("Uuid", new ScriptUUID());
1299− rootContext->setContextProperty("Assets", DependencyManager::get<AssetMappingsScriptingInterface>().data());
1298+ rootContext->setContextProperty("Assets", new AssetMappingsScriptingInterface());
13001299
13011300 rootContext->setContextProperty("AvatarList", DependencyManager::get<AvatarManager>().data());
13021301