Merge branch '3.8' into 3.9-beta

This commit is contained in:
badlogic 2020-06-03 13:24:37 +02:00
commit befba130ad
13 changed files with 13 additions and 13 deletions

View File

@ -8048,7 +8048,7 @@ var spine;
worldVertices[offset + 1] = offsetX * c + offsetY * d + y; worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
}; };
RegionAttachment.prototype.copy = function () { RegionAttachment.prototype.copy = function () {
var copy = new RegionAttachment(name); var copy = new RegionAttachment(this.name);
copy.region = this.region; copy.region = this.region;
copy.rendererObject = this.rendererObject; copy.rendererObject = this.rendererObject;
copy.path = this.path; copy.path = this.path;

File diff suppressed because one or more lines are too long

View File

@ -8048,7 +8048,7 @@ var spine;
worldVertices[offset + 1] = offsetX * c + offsetY * d + y; worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
}; };
RegionAttachment.prototype.copy = function () { RegionAttachment.prototype.copy = function () {
var copy = new RegionAttachment(name); var copy = new RegionAttachment(this.name);
copy.region = this.region; copy.region = this.region;
copy.rendererObject = this.rendererObject; copy.rendererObject = this.rendererObject;
copy.path = this.path; copy.path = this.path;

File diff suppressed because one or more lines are too long

View File

@ -8048,7 +8048,7 @@ var spine;
worldVertices[offset + 1] = offsetX * c + offsetY * d + y; worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
}; };
RegionAttachment.prototype.copy = function () { RegionAttachment.prototype.copy = function () {
var copy = new RegionAttachment(name); var copy = new RegionAttachment(this.name);
copy.region = this.region; copy.region = this.region;
copy.rendererObject = this.rendererObject; copy.rendererObject = this.rendererObject;
copy.path = this.path; copy.path = this.path;

File diff suppressed because one or more lines are too long

View File

@ -8048,7 +8048,7 @@ var spine;
worldVertices[offset + 1] = offsetX * c + offsetY * d + y; worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
}; };
RegionAttachment.prototype.copy = function () { RegionAttachment.prototype.copy = function () {
var copy = new RegionAttachment(name); var copy = new RegionAttachment(this.name);
copy.region = this.region; copy.region = this.region;
copy.rendererObject = this.rendererObject; copy.rendererObject = this.rendererObject;
copy.path = this.path; copy.path = this.path;

File diff suppressed because one or more lines are too long

View File

@ -8048,7 +8048,7 @@ var spine;
worldVertices[offset + 1] = offsetX * c + offsetY * d + y; worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
}; };
RegionAttachment.prototype.copy = function () { RegionAttachment.prototype.copy = function () {
var copy = new RegionAttachment(name); var copy = new RegionAttachment(this.name);
copy.region = this.region; copy.region = this.region;
copy.rendererObject = this.rendererObject; copy.rendererObject = this.rendererObject;
copy.path = this.path; copy.path = this.path;

File diff suppressed because one or more lines are too long

View File

@ -8048,7 +8048,7 @@ var spine;
worldVertices[offset + 1] = offsetX * c + offsetY * d + y; worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
}; };
RegionAttachment.prototype.copy = function () { RegionAttachment.prototype.copy = function () {
var copy = new RegionAttachment(name); var copy = new RegionAttachment(this.name);
copy.region = this.region; copy.region = this.region;
copy.rendererObject = this.rendererObject; copy.rendererObject = this.rendererObject;
copy.path = this.path; copy.path = this.path;

File diff suppressed because one or more lines are too long

View File

@ -214,7 +214,7 @@ module spine {
} }
copy (): Attachment { copy (): Attachment {
let copy = new RegionAttachment(name); let copy = new RegionAttachment(this.name);
copy.region = this.region; copy.region = this.region;
copy.rendererObject = this.rendererObject; copy.rendererObject = this.rendererObject;
copy.path = this.path; copy.path = this.path;