Merge branch 'master' into 1.16
This commit is contained in:
commit
7f8735021f
2 files changed
+2
-2
No files matched your search
@@ -474,7 +474,7 @@ public class ShapeDispatcher
|
|||||||
String alignStr = options.get("align").getString();
|
String alignStr = options.get("align").getString();
|
||||||
if ("right".equalsIgnoreCase(alignStr))
|
if ("right".equalsIgnoreCase(alignStr))
|
||||||
align = 1;
|
align = 1;
|
||||||
else
|
else if ("left".equalsIgnoreCase(alignStr))
|
||||||
align = -1;
|
align = -1;
|
||||||
}
|
}
|
||||||
doublesided = false;
|
doublesided = false;
|
||||||
|
|||||||
@@ -269,7 +269,7 @@ public class ShapesRenderer
|
|||||||
{
|
{
|
||||||
RenderSystem.rotatef(shape.tilt, 0.0f, 0.0f, 1.0f);
|
RenderSystem.rotatef(shape.tilt, 0.0f, 0.0f, 1.0f);
|
||||||
}
|
}
|
||||||
RenderSystem.translatef(-10*shape.indent, -10*shape.height, (float) (-10*renderEpsilon)-10*shape.raise);
|
RenderSystem.translatef(-10*shape.indent, -10*shape.height-9, (float) (-10*renderEpsilon)-10*shape.raise);
|
||||||
//if (visibleThroughWalls) RenderSystem.disableDepthTest();
|
//if (visibleThroughWalls) RenderSystem.disableDepthTest();
|
||||||
RenderSystem.scalef(-1.0F, 1.0F, 1.0F);
|
RenderSystem.scalef(-1.0F, 1.0F, 1.0F);
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user