From: Vitaliy Date: Sat, 10 Mar 2018 18:33:37 +0000 (+0300) Subject: Drop texture file list cache (#6660) X-Git-Tag: 5.0.0~530 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cf8d579abc00fee20fb1dfa2e87aaf9dddbee18c;p=oweals%2Fminetest.git Drop texture file list cache (#6660) --- 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();