From cf8d579abc00fee20fb1dfa2e87aaf9dddbee18c Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Sat, 10 Mar 2018 21:33:37 +0300 Subject: [PATCH] Drop texture file list cache (#6660) --- src/client/tile.cpp | 6 ++---- 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 &getTextureDirs() +std::vector getTextureDirs() { - static thread_local std::vector 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 &getTextureDirs(); +std::vector getTextureDirs();