diff --git a/data/resources/font.fdf b/data/resources-common/font.fdf similarity index 100% rename from data/resources/font.fdf rename to data/resources-common/font.fdf diff --git a/data/resources/font.png b/data/resources-common/font.png similarity index 100% rename from data/resources/font.png rename to data/resources-common/font.png diff --git a/drape/texture_manager.cpp b/drape/texture_manager.cpp index 7f4b1a08c8..512166e9a8 100644 --- a/drape/texture_manager.cpp +++ b/drape/texture_manager.cpp @@ -111,7 +111,7 @@ void TextureManager::Init(string const & resourcePrefix) m_textures.push_back(MasterPointer(defaultSet)); vector > tempTextures; - LoadFont(string("resources/font"), tempTextures); + LoadFont(string("resources-common/font"), tempTextures); for (size_t i = 0; i < tempTextures.size(); ++i) { RefPointer set = m_textures.back().GetRefPointer(); @@ -130,11 +130,6 @@ void TextureManager::Init(string const & resourcePrefix) m_textures.push_back(MasterPointer(new TextureSet(m_maxTextureBlocks))); textureSet = m_textures.back().GetRefPointer(); } - - typedef DynamicTexture TStippleTexture; - typedef DynamicTexture TColorTexture; - textureSet->AddTexture(MovePointer(new TStippleTexture(m2::PointU(1024, 1024), dp::ALPHA))); - textureSet->AddTexture(MovePointer(new TColorTexture(m2::PointU(1024, 1024), dp::RGBA8))); } void TextureManager::Release()