Update inventory texture too

[oweals/minetest.git] / src / nodedef.cpp

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 7b723e958daa79425be4211d373c2bc82bad3671..57807449e4247fe2925afd001a19ce7c051fd043 100644 (file)
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -64,6 +64,7 @@ void ContentFeatures::setInventoryTexture(std::string imgname,
        
        imgname += "^[forcesingle";
        
+       inventory_texture_name = imgname;
        inventory_texture = tsrc->getTextureRaw(imgname);
 }
 
@@ -84,6 +85,7 @@ void ContentFeatures::setInventoryTextureCube(std::string top,
        imgname_full += left;
        imgname_full += "{";
        imgname_full += right;
+       inventory_texture_name = imgname_full;
        inventory_texture = tsrc->getTextureRaw(imgname_full);
 }
 #endif
@@ -174,8 +176,17 @@ public:
                        ContentFeatures *f = &m_content_features[i];
                        for(u16 j=0; j<6; j++)
                                tsrc->updateAP(f->tiles[j].texture);
-                       if(f->special_atlas)
+                       if(f->special_atlas){
                                tsrc->updateAP(*(f->special_atlas));
+                               if(f->special_material)
+                                       f->special_material->setTexture(0, f->special_atlas->atlas);
+                               if(f->special_material2)
+                                       f->special_material2->setTexture(0, f->special_atlas->atlas);
+                       }
+                       if(f->inventory_texture_name != ""){
+                               f->inventory_texture =
+                                       tsrc->getTextureRaw(f->inventory_texture_name);
+                       }
                }
 #endif
        }