diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2012-11-30 18:12:32 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-12-02 00:38:26 +0200 |
| commit | bee170570de7a796ac7b5ba6c0b39b253380b5e3 (patch) | |
| tree | 66b8d4317df37790edb1caf3b4529a73c48639a5 /src/content_cao.cpp | |
| parent | ba73e75ef9b59608c78bff09b7808f076bef014b (diff) | |
| download | minetest-bee170570de7a796ac7b5ba6c0b39b253380b5e3.tar.gz minetest-bee170570de7a796ac7b5ba6c0b39b253380b5e3.tar.bz2 minetest-bee170570de7a796ac7b5ba6c0b39b253380b5e3.zip | |
On-demand item meshes and textures
Diffstat (limited to 'src/content_cao.cpp')
| -rw-r--r-- | src/content_cao.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/content_cao.cpp b/src/content_cao.cpp index 8229ded62..d71911b95 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -472,7 +472,7 @@ void ItemCAO::updateTexture() IItemDefManager *idef = m_gamedef->idef(); ItemStack item; item.deSerialize(is, idef); - texture = item.getDefinition(idef).inventory_texture; + texture = idef->getInventoryTexture(item.getDefinition(idef).name, m_gamedef); } catch(SerializationError &e) { @@ -957,7 +957,7 @@ public: infostream<<"textures[0]: "<<m_prop.textures[0]<<std::endl; IItemDefManager *idef = m_gamedef->idef(); ItemStack item(m_prop.textures[0], 1, 0, "", idef); - scene::IMesh *item_mesh = item.getDefinition(idef).wield_mesh; + scene::IMesh *item_mesh = idef->getWieldMesh(item.getDefinition(idef).name, m_gamedef); // Copy mesh to be able to set unique vertex colors scene::IMeshManipulator *manip = |