Drop texture file list cache (#6660)

minetest · Mar 10, 2018 · cf8d579abc00fee20fb1dfa2e87aaf9dddbee18c · cf8d579
1 parent ee20433
commit cf8d579abc00fee20fb1dfa2e87aaf9dddbee18c
Unified Split

Showing with 3 additions and 5 deletions.

+2 −4 src/client/tile.cpp

+1 −1 src/client/tile.h
diff --git 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
@@ -339,4 +339,4 @@ struct TileSpec
 	TileLayer layers[MAX_TILE_LAYERS];
 };
 
-const std::vector<std::string> &getTextureDirs();
+std::vector<std::string> getTextureDirs();