diff options
| author | Craig Robbins <kde.psych@gmail.com> | 2015-02-11 17:01:19 +1000 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2015-02-11 17:01:19 +1000 |
| commit | f824866686ddba471a7b0c3178eaf968883bb69e (patch) | |
| tree | 44f3e00e3f23f48648e066b70a8cdd41cdd8a08f /src/itemdef.cpp | |
| parent | d25ff8fd2592f457b91e8a61240694af3902d23f (diff) | |
| download | minetest-f824866686ddba471a7b0c3178eaf968883bb69e.tar.gz minetest-f824866686ddba471a7b0c3178eaf968883bb69e.tar.bz2 minetest-f824866686ddba471a7b0c3178eaf968883bb69e.zip | |
Revert "Remove workaround in itemdef.cpp to enable/disable/enable "enable_shaders" setting"
This reverts commit d25ff8fd2592f457b91e8a61240694af3902d23f.
Diffstat (limited to 'src/itemdef.cpp')
| -rw-r--r-- | src/itemdef.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/itemdef.cpp b/src/itemdef.cpp index d356b96c5..ac67c5b27 100644 --- a/src/itemdef.cpp +++ b/src/itemdef.cpp @@ -362,6 +362,8 @@ 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) @@ -370,7 +372,11 @@ public: /* Make a mesh from the node */ - MeshMakeData mesh_make_data(gamedef, false); + if (g_settings->getBool("enable_shaders")) { + reenable_shaders = true; + g_settings->setBool("enable_shaders", false); + } + MeshMakeData mesh_make_data(gamedef); u8 param2 = 0; if (f.param_type_2 == CPT2_WALLMOUNTED) param2 = 1; @@ -437,6 +443,9 @@ public: if (node_mesh) node_mesh->drop(); + + if (reenable_shaders) + g_settings->setBool("enable_shaders",true); } // Put in cache |