Fix unit test if there isn't a localhost address (for example FreeBSD jails), second...

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

diff --git a/src/itemdef.cpp b/src/itemdef.cpp
index ac67c5b271994827502559cf0fc28543e4357674..d356b96c5379d4b2f68cb7becf2416853c40e060 100644 (file)
--- a/src/itemdef.cpp
+++ b/src/itemdef.cpp
@@ -362,8 +362,6 @@ public:
 
                        scene::IMesh *node_mesh = NULL;
 
-                       bool reenable_shaders = false;
-
                        if (need_rtt_mesh || need_wield_mesh) {
                                u8 param1 = 0;
                                if (f.param_type == CPT_LIGHT)
@@ -372,11 +370,7 @@ public:
                                /*
                                        Make a mesh from the node
                                */
-                               if (g_settings->getBool("enable_shaders")) {
-                                       reenable_shaders = true;
-                                       g_settings->setBool("enable_shaders", false);
-                               }
-                               MeshMakeData mesh_make_data(gamedef);
+                               MeshMakeData mesh_make_data(gamedef, false);
                                u8 param2 = 0;
                                if (f.param_type_2 == CPT2_WALLMOUNTED)
                                        param2 = 1;
@@ -443,9 +437,6 @@ public:
 
                        if (node_mesh)
                                node_mesh->drop();
-
-                       if (reenable_shaders)
-                               g_settings->setBool("enable_shaders",true);
                }
 
                // Put in cache