projects
/
oweals
/
minetest.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
af4b63f
)
Plantlike meshoptions: fix degrotate. (#4512)
author
Auke Kok
<sofar+github@foo-projects.org>
Mon, 12 Sep 2016 23:04:13 +0000
(16:04 -0700)
committer
GitHub
<noreply@github.com>
Mon, 12 Sep 2016 23:04:13 +0000
(16:04 -0700)
This snuck in with the meshoptions patch and accidentally kills
degrotate plants. Thanks to @hybriddog for finding this.
src/content_mapblock.cpp
patch
|
blob
|
history
diff --git
a/src/content_mapblock.cpp
b/src/content_mapblock.cpp
index b86b97822bcb81ade36de635bb51c940224768d7..173649aee7f50a4c2552604da382c7aa9b094731 100644
(file)
--- 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);