diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/utils/SkeletonClipping.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/utils/SkeletonClipping.java index 373d653d1..ee60dfc42 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/utils/SkeletonClipping.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/utils/SkeletonClipping.java @@ -47,8 +47,8 @@ public class SkeletonClipping { private ClippingAttachment clipAttachment; private Array clippingPolygons; - public void clipStart (Slot slot, ClippingAttachment clip) { - if (clipAttachment != null) return; + public int clipStart (Slot slot, ClippingAttachment clip) { + if (clipAttachment != null) return 0; clipAttachment = clip; int n = clip.getWorldVerticesLength(); @@ -61,6 +61,7 @@ public class SkeletonClipping { polygon.add(polygon.items[0]); polygon.add(polygon.items[1]); } + return clippingPolygons.size; } public void clipEnd (Slot slot) { diff --git a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java index ca5e78545..30621c5aa 100644 --- a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java +++ b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java @@ -908,7 +908,7 @@ public class SkeletonViewer extends ApplicationAdapter { if (os.contains("Windows")) dpiScale = Toolkit.getDefaultToolkit().getScreenResolution() / 96f; if (os.contains("OS X")) { Object object = Toolkit.getDefaultToolkit().getDesktopProperty("apple.awt.contentScaleFactor"); - if (object instanceof Float && ((Float)object).intValue() == 2) dpiScale = 2; + if (object instanceof Float && ((Float)object).intValue() >= 2) dpiScale = 2; } if (dpiScale >= 2.0f) uiScale = 2;