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:
7bd3e2b
)
Revert "Plantlike: Fix visual_scale being applied squared (#5115)"
author
Craig Robbins
<kde.psych@gmail.com>
Fri, 10 Feb 2017 12:21:49 +0000
(22:21 +1000)
committer
Craig Robbins
<kde.psych@gmail.com>
Fri, 10 Feb 2017 12:21:49 +0000
(22:21 +1000)
This reverts commit
953cbb3b15997a0e7c7c32af2365cb5046a9e476
.
src/content_mapblock.cpp
patch
|
blob
|
history
diff --git
a/src/content_mapblock.cpp
b/src/content_mapblock.cpp
index 9923647bcde87a26f42542ee93172b3a0c6d46f1..45822666f22e7bc70bdd08d8293bbd00d04ad242 100644
(file)
--- a/
src/content_mapblock.cpp
+++ b/
src/content_mapblock.cpp
@@
-1602,6
+1602,8
@@
void mapblock_mesh_generate_special(MeshMakeData *data,
}
for (int i = 0; i < 4; i++) {
+ vertices[i].Pos *= f.visual_scale;
+ vertices[i].Pos.Y += BS/2 * (f.visual_scale - 1);
if (data->m_smooth_lighting)
vertices[i].Color = blendLight(frame, vertices[i].Pos, tile.color);
vertices[i].Pos += intToFloat(p, BS);