Only top-level masters can load external resource dirs

# Conflicts:
#	src/Engine/ModInfo.cpp

src/Engine/ModInfo.cpp

@@ -101,8 +101,6 @@ void ModInfo::load(const std::string &filename)
 		// default a master's master to none.  masters can still have
 		// masters, but they must be explicitly declared.
 		_master = "";
-		// only masters can load external resource dirs
-		_externalResourceDirs = doc["loadResources"].as< std::vector<std::string> >(_externalResourceDirs);
 	}
 	_resourceConfigFile = doc["resourceConfig"].as<std::string>(_resourceConfigFile);
 
@@ -111,6 +109,12 @@ void ModInfo::load(const std::string &filename)
 	{
 		_master = "";
 	}
+
+	if (_isMaster && _master.empty())
+	{
+		// only top-level masters can load external resource dirs
+		_externalResourceDirs = doc["loadResources"].as< std::vector<std::string> >(_externalResourceDirs);
+	}
 }
 
 const std::string &ModInfo::getPath()                    const { return _path;                    }