diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-14 22:43:22 +0200 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-14 22:43:28 +0200 |
| commit | 3560f0de082a8950a84e2e866981f8bdfd05428a (patch) | |
| tree | dfb765f7e590189f05e7807c80be72e6ecf8cc4d /src/mapblock_mesh.cpp | |
| parent | 5146c826be9386cc2adeb8f678063a2f9cfc1dee (diff) | |
| parent | 81535f6277b66c869cda7125b2aeaf99e8078b92 (diff) | |
| download | minetest-3560f0de082a8950a84e2e866981f8bdfd05428a.tar.gz minetest-3560f0de082a8950a84e2e866981f8bdfd05428a.tar.bz2 minetest-3560f0de082a8950a84e2e866981f8bdfd05428a.zip | |
Merge branch 'upstream/master'
Conflicts:
data/oerkki1.png
src/client.cpp
Diffstat (limited to 'src/mapblock_mesh.cpp')
| -rw-r--r-- | src/mapblock_mesh.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp index d4921c2c5..447716d00 100644 --- a/src/mapblock_mesh.cpp +++ b/src/mapblock_mesh.cpp @@ -64,11 +64,7 @@ void MeshMakeData::fill(u32 daynight_ratio, MapBlock *block) */ // Get map - NodeContainer *parentcontainer = block->getParent(); - // This will only work if the parent is the map - assert(parentcontainer->nodeContainerId() == NODECONTAINER_ID_MAP); - // OK, we have the map! - Map *map = (Map*)parentcontainer; + Map *map = block->getParent(); for(u16 i=0; i<6; i++) { |