aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAuke Kok <sofar+github@foo-projects.org>2016-09-12 16:04:13 -0700
committerGitHub <noreply@github.com>2016-09-12 16:04:13 -0700
commitd83bcf2c50af3fec37ac8d202064bd2ad92a6d8e (patch)
tree374d777b50b68e1c03d6683972e93f32f9a1d6e1
parentaf4b63ff21ef03bb21ebbc023b84f1e54c172008 (diff)
downloadminetest-d83bcf2c50af3fec37ac8d202064bd2ad92a6d8e.tar.gz
minetest-d83bcf2c50af3fec37ac8d202064bd2ad92a6d8e.tar.bz2
minetest-d83bcf2c50af3fec37ac8d202064bd2ad92a6d8e.zip
Plantlike meshoptions: fix degrotate. (#4512)
This snuck in with the meshoptions patch and accidentally kills degrotate plants. Thanks to @hybriddog for finding this.
-rw-r--r--src/content_mapblock.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
index b86b97822..173649aee 100644
--- a/src/content_mapblock.cpp
+++ b/src/content_mapblock.cpp
@@ -1138,7 +1138,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
u8 p2mesh = 0;
if (f.param_type_2 == CPT2_DEGROTATE)
rotate_degree = n.param2 * 2;
- else if (f.param_type_2 != CPT2_MESHOPTIONS) {
+ if (f.param_type_2 != CPT2_MESHOPTIONS) {
if (j == 0) {
for (u16 i = 0; i < 4; i++)
vertices[i].Pos.rotateXZBy(46 + rotate_degree);