diff options
| author | Vitaliy <silverunicorn2011@yandex.ru> | 2018-03-10 21:33:37 +0300 |
|---|---|---|
| committer | SmallJoker <SmallJoker@users.noreply.github.com> | 2018-03-10 19:33:37 +0100 |
| commit | cf8d579abc00fee20fb1dfa2e87aaf9dddbee18c (patch) | |
| tree | 8974682fc0556e3498d6575aa7a4f166bbf3d4cc /src | |
| parent | ee20433425f01998c2903d9f8185ce9dd3dc6e77 (diff) | |
| download | minetest-cf8d579abc00fee20fb1dfa2e87aaf9dddbee18c.tar.gz minetest-cf8d579abc00fee20fb1dfa2e87aaf9dddbee18c.tar.bz2 minetest-cf8d579abc00fee20fb1dfa2e87aaf9dddbee18c.zip | |
Drop texture file list cache (#6660)
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/tile.cpp | 6 | ||||
| -rw-r--r-- | src/client/tile.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/client/tile.cpp b/src/client/tile.cpp index 91a3c0a38..a88163a50 100644 --- a/src/client/tile.cpp +++ b/src/client/tile.cpp @@ -2390,9 +2390,7 @@ video::ITexture *TextureSource::getShaderFlagsTexture(bool normalmap_present) } -const std::vector<std::string> &getTextureDirs() +std::vector<std::string> getTextureDirs() { - static thread_local std::vector<std::string> dirs = - fs::GetRecursiveDirs(g_settings->get("texture_path")); - return dirs; + return fs::GetRecursiveDirs(g_settings->get("texture_path")); } diff --git a/src/client/tile.h b/src/client/tile.h index 6436a93d3..c21594206 100644 --- a/src/client/tile.h +++ b/src/client/tile.h @@ -339,4 +339,4 @@ struct TileSpec TileLayer layers[MAX_TILE_LAYERS]; }; -const std::vector<std::string> &getTextureDirs(); +std::vector<std::string> getTextureDirs(); |