From: Auke Kok <sofar+github@foo-projects.org>
Date: Mon, 12 Sep 2016 23:04:13 +0000 (-0700)
Subject: Plantlike meshoptions: fix degrotate. (#4512)
X-Git-Tag: 0.4.15~240
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d83bcf2c50af3fec37ac8d202064bd2ad92a6d8e;p=oweals%2Fminetest.git

Plantlike meshoptions: fix degrotate. (#4512)

This snuck in with the meshoptions patch and accidentally kills
degrotate plants. Thanks to @hybriddog for finding this.
---

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);