make ResourceManager be owned by DependencyManager

Seth Alves committed 9 years ago

Commit 794495c1 parent 561786023 files · +68 −65Browse files

Showing the changes to interface/src/scripting/TestScriptingInterface.cpp (1 of 23 files). Show all

Unified · Split

interface/src/scripting/TestScriptingInterface.cpp+1−1

@@ -62,7 +62,7 @@ bool TestScriptingInterface::loadTestScene(QString scene) { · 61 unmodified lines
62	static const QString TEST_SCRIPTS_ROOT = TEST_ROOT + "scripts/";	62	static const QString TEST_SCRIPTS_ROOT = TEST_ROOT + "scripts/";
63	static const QString TEST_SCENES_ROOT = TEST_ROOT + "scenes/";	63	static const QString TEST_SCENES_ROOT = TEST_ROOT + "scenes/";
64	return DependencyManager::get<OffscreenUi>()->returnFromUiThread([scene]()->QVariant {	64	return DependencyManager::get<OffscreenUi>()->returnFromUiThread([scene]()->QVariant {
65	ResourceManager::setUrlPrefixOverride("atp:/", TEST_BINARY_ROOT + scene + ".atp/");	65	DependencyManager::get<ResourceManager>()->setUrlPrefixOverride("atp:/", TEST_BINARY_ROOT + scene + ".atp/");
66	auto tree = qApp->getEntities()->getTree();	66	auto tree = qApp->getEntities()->getTree();
67	auto treeIsClient = tree->getIsClient();	67	auto treeIsClient = tree->getIsClient();
68	// Force the tree to accept the load regardless of permissions	68	// Force the tree to accept the load regardless of permissions