diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-17 19:11:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-17 19:11:28 +0200 |
| commit | 8f7785771b9e02b1a1daf7a252550d78ea93053d (patch) | |
| tree | 7a4e4b524dbc63fed3dac99a3844b634cc621d0d /src/mapblock_mesh.cpp | |
| parent | 76be103a91d6987527af19e87d93007be8ba8a67 (diff) | |
| download | minetest-8f7785771b9e02b1a1daf7a252550d78ea93053d.tar.gz minetest-8f7785771b9e02b1a1daf7a252550d78ea93053d.tar.bz2 minetest-8f7785771b9e02b1a1daf7a252550d78ea93053d.zip | |
Cpp11 initializers 2 (#5999)
* C++11 patchset 10: continue cleanup on constructors
* Drop obsolete bool MainMenuData::enable_public (setting is called with cURL in server loop)
* More classes cleanup
* More classes cleanup + change NULL tests to boolean tests
Diffstat (limited to 'src/mapblock_mesh.cpp')
| -rw-r--r-- | src/mapblock_mesh.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp index 4fcdaaa57..04a22716c 100644 --- a/src/mapblock_mesh.cpp +++ b/src/mapblock_mesh.cpp @@ -38,11 +38,6 @@ with this program; if not, write to the Free Software Foundation, Inc., MeshMakeData::MeshMakeData(Client *client, bool use_shaders, bool use_tangent_vertices): - m_vmanip(), - m_blockpos(-1337,-1337,-1337), - m_crack_pos_relative(-1337, -1337, -1337), - m_smooth_lighting(false), - m_show_hud(false), m_client(client), m_use_shaders(use_shaders), m_use_tangent_vertices(use_tangent_vertices) @@ -1073,7 +1068,7 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset): const u16 indices[] = {0,1,2,2,3,0}; const u16 indices_alternate[] = {0,1,3,2,3,1}; - if (f.layer.texture == NULL) + if (!f.layer.texture) continue; const u16 *indices_p = |