BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Global new() or grab() to be managed in constuctor only (#7235 partial) (#7236)

Browse Source 
* g_extrusion_mesh_cache new() and grab() to be managed in constuctor only (#7235 partial)

This global was getting grab()-ed by each call to getItemMesh, incrementing its reference count. What was to be the final drop() in the destructor ended up with > 0 reference count, so memory not freed by Irrlicht.
This commit is contained in:
JDCodeIt 2018-04-30 11:14:28 -06:00 committed by SmallJoker
parent ba91624d8c
commit 5862d9e482
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wieldmesh.cpp
View File

@ -501,12 +501,8 @@ void getItemMesh(Client *client, const ItemStack &item, ItemMesh *result)
const ContentFeatures &f = ndef->get(def.name); const ContentFeatures &f = ndef->get(def.name);
content_t id = ndef->getId(def.name); content_t id = ndef->getId(def.name);
if (!g_extrusion_mesh_cache) { FATAL_ERROR_IF(!g_extrusion_mesh_cache, "Extrusion mesh cache is not yet initialized");
g_extrusion_mesh_cache = new ExtrusionMeshCache();
} else {
g_extrusion_mesh_cache->grab();
}
scene::SMesh *mesh = nullptr; scene::SMesh *mesh = nullptr;
// Shading is on by default // Shading is on by default