Merge branch 'kotlin-1.11.2' into kotlin-1.12

2017-07-10 17:29:06 +02:00
parent 55095e7252 f145ff221e
commit dec1f6ff03
11 changed files with 43 additions and 22 deletions
@@ -247,7 +247,6 @@ abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandl
                    postProcess = { _, _, _, _, _ ->
                        if (isLidUp) {
                            rotateUV(idx + if (logAxis == Axis.X) 1 else 0)
-                            if (logAxis == Axis.X) mirrorUV(true, true)
                        }
                    }
                )
@@ -259,7 +258,6 @@ abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandl
                    postProcess = { _, _, _, _, _ ->
                        if (isLidDown) {
                            rotateUV((if (logAxis == Axis.X) 0 else 3) - idx)
-                            if (logAxis != Axis.Y) mirrorUV(true, true)
                        }
                    }
                )