Drop texture file list cache (#6660)

numberZero · SmallJoker · commit cf8d579abc00 · 2018-03-10T19:33:37.000+01:00
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();

Original file line number	Diff line number	Diff line change
`@@ -2390,9 +2390,7 @@ video::ITexture *TextureSource::getShaderFlagsTexture(bool normalmap_present)`
`2390`	`2390`
`2391`	`2391`	`}`
`2392`	`2392`
`2393`		`-const std::vector<std::string> &getTextureDirs()`
	`2393`	`+std::vector<std::string> getTextureDirs()`
`2394`	`2394`	`{`
`2395`		`- static thread_local std::vector<std::string> dirs =`
`2396`		`- fs::GetRecursiveDirs(g_settings->get("texture_path"));`
`2397`		`- return dirs;`
	`2395`	`+ return fs::GetRecursiveDirs(g_settings->get("texture_path"));`
`2398`	`2396`	`}`