From 6135fa868497ea86f81ea1ceeb12384a8c6aac81 Mon Sep 17 00:00:00 2001 From: Nathan Sweet Date: Mon, 31 Jan 2022 11:21:07 -0400 Subject: [PATCH] [libgdx] Made fixes from 4.1-beta-physics in 4.1-beta. --- .../spine/attachments/BoundingBoxAttachment.java | 2 +- .../esotericsoftware/spine/attachments/ClippingAttachment.java | 2 +- .../com/esotericsoftware/spine/attachments/MeshAttachment.java | 2 +- .../esotericsoftware/spine/attachments/RegionAttachment.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/BoundingBoxAttachment.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/BoundingBoxAttachment.java index 99346857b..10d85c99f 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/BoundingBoxAttachment.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/BoundingBoxAttachment.java @@ -59,6 +59,6 @@ public class BoundingBoxAttachment extends VertexAttachment { } public BoundingBoxAttachment copy () { - return new BoundingBoxAttachment(name); + return new BoundingBoxAttachment(this); } } diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/ClippingAttachment.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/ClippingAttachment.java index 3b2825a80..a3d9a62d4 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/ClippingAttachment.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/ClippingAttachment.java @@ -69,6 +69,6 @@ public class ClippingAttachment extends VertexAttachment { } public ClippingAttachment copy () { - return new ClippingAttachment(name); + return new ClippingAttachment(this); } } diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/MeshAttachment.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/MeshAttachment.java index 8aa35026b..6efc7e482 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/MeshAttachment.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/MeshAttachment.java @@ -80,7 +80,7 @@ public class MeshAttachment extends VertexAttachment implements HasTextureRegion arraycopy(other.triangles, 0, triangles, 0, triangles.length); hullLength = other.hullLength; - sequence = sequence != null ? new Sequence(sequence) : null; + sequence = other.sequence != null ? new Sequence(other.sequence) : null; // Nonessential. if (other.edges != null) { diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/RegionAttachment.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/RegionAttachment.java index d7f9c76ff..8bfa883d1 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/RegionAttachment.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/RegionAttachment.java @@ -75,7 +75,7 @@ public class RegionAttachment extends Attachment implements HasTextureRegion { arraycopy(other.uvs, 0, uvs, 0, 8); arraycopy(other.offset, 0, offset, 0, 8); color.set(other.color); - sequence = sequence != null ? new Sequence(sequence) : null; + sequence = other.sequence != null ? new Sequence(other.sequence) : null; } /** Calculates the {@link #offset} and {@link #uvs} using the region and the attachment's transform. Must be called if the