diff --git a/spine-ts/build/spine-all.js b/spine-ts/build/spine-all.js index 12080bfb6..8f3c04aeb 100644 --- a/spine-ts/build/spine-all.js +++ b/spine-ts/build/spine-all.js @@ -565,7 +565,7 @@ var spine; slot.color.setFromColor(slot.data.color); slot.darkColor.setFromColor(slot.data.darkColor); return; - case MixBlend.setup: + case MixBlend.first: var light = slot.color, dark = slot.darkColor, setupLight = slot.data.color, setupDark = slot.data.darkColor; light.add((setupLight.r - light.r) * alpha, (setupLight.g - light.g) * alpha, (setupLight.b - light.b) * alpha, (setupLight.a - light.a) * alpha); dark.add((setupDark.r - dark.r) * alpha, (setupDark.g - dark.g) * alpha, (setupDark.b - dark.b) * alpha, 0); @@ -1052,7 +1052,7 @@ var spine; constraint.scaleMix = data.scaleMix; constraint.shearMix = data.shearMix; return; - case MixBlend.setup: + case MixBlend.first: constraint.rotateMix += (data.rotateMix - constraint.rotateMix) * alpha; constraint.translateMix += (data.translateMix - constraint.translateMix) * alpha; constraint.scaleMix += (data.scaleMix - constraint.scaleMix) * alpha; diff --git a/spine-ts/build/spine-canvas.js b/spine-ts/build/spine-canvas.js index 9e8d7ef61..443211e1b 100644 --- a/spine-ts/build/spine-canvas.js +++ b/spine-ts/build/spine-canvas.js @@ -565,7 +565,7 @@ var spine; slot.color.setFromColor(slot.data.color); slot.darkColor.setFromColor(slot.data.darkColor); return; - case MixBlend.setup: + case MixBlend.first: var light = slot.color, dark = slot.darkColor, setupLight = slot.data.color, setupDark = slot.data.darkColor; light.add((setupLight.r - light.r) * alpha, (setupLight.g - light.g) * alpha, (setupLight.b - light.b) * alpha, (setupLight.a - light.a) * alpha); dark.add((setupDark.r - dark.r) * alpha, (setupDark.g - dark.g) * alpha, (setupDark.b - dark.b) * alpha, 0); @@ -1052,7 +1052,7 @@ var spine; constraint.scaleMix = data.scaleMix; constraint.shearMix = data.shearMix; return; - case MixBlend.setup: + case MixBlend.first: constraint.rotateMix += (data.rotateMix - constraint.rotateMix) * alpha; constraint.translateMix += (data.translateMix - constraint.translateMix) * alpha; constraint.scaleMix += (data.scaleMix - constraint.scaleMix) * alpha; diff --git a/spine-ts/build/spine-core.js b/spine-ts/build/spine-core.js index e90caecd5..09a8b74e3 100644 --- a/spine-ts/build/spine-core.js +++ b/spine-ts/build/spine-core.js @@ -565,7 +565,7 @@ var spine; slot.color.setFromColor(slot.data.color); slot.darkColor.setFromColor(slot.data.darkColor); return; - case MixBlend.setup: + case MixBlend.first: var light = slot.color, dark = slot.darkColor, setupLight = slot.data.color, setupDark = slot.data.darkColor; light.add((setupLight.r - light.r) * alpha, (setupLight.g - light.g) * alpha, (setupLight.b - light.b) * alpha, (setupLight.a - light.a) * alpha); dark.add((setupDark.r - dark.r) * alpha, (setupDark.g - dark.g) * alpha, (setupDark.b - dark.b) * alpha, 0); @@ -1052,7 +1052,7 @@ var spine; constraint.scaleMix = data.scaleMix; constraint.shearMix = data.shearMix; return; - case MixBlend.setup: + case MixBlend.first: constraint.rotateMix += (data.rotateMix - constraint.rotateMix) * alpha; constraint.translateMix += (data.translateMix - constraint.translateMix) * alpha; constraint.scaleMix += (data.scaleMix - constraint.scaleMix) * alpha; diff --git a/spine-ts/build/spine-threejs.js b/spine-ts/build/spine-threejs.js index cd42e601c..715738ca7 100644 --- a/spine-ts/build/spine-threejs.js +++ b/spine-ts/build/spine-threejs.js @@ -565,7 +565,7 @@ var spine; slot.color.setFromColor(slot.data.color); slot.darkColor.setFromColor(slot.data.darkColor); return; - case MixBlend.setup: + case MixBlend.first: var light = slot.color, dark = slot.darkColor, setupLight = slot.data.color, setupDark = slot.data.darkColor; light.add((setupLight.r - light.r) * alpha, (setupLight.g - light.g) * alpha, (setupLight.b - light.b) * alpha, (setupLight.a - light.a) * alpha); dark.add((setupDark.r - dark.r) * alpha, (setupDark.g - dark.g) * alpha, (setupDark.b - dark.b) * alpha, 0); @@ -1052,7 +1052,7 @@ var spine; constraint.scaleMix = data.scaleMix; constraint.shearMix = data.shearMix; return; - case MixBlend.setup: + case MixBlend.first: constraint.rotateMix += (data.rotateMix - constraint.rotateMix) * alpha; constraint.translateMix += (data.translateMix - constraint.translateMix) * alpha; constraint.scaleMix += (data.scaleMix - constraint.scaleMix) * alpha; diff --git a/spine-ts/build/spine-webgl.js b/spine-ts/build/spine-webgl.js index 7eea90553..85d46ab53 100644 --- a/spine-ts/build/spine-webgl.js +++ b/spine-ts/build/spine-webgl.js @@ -565,7 +565,7 @@ var spine; slot.color.setFromColor(slot.data.color); slot.darkColor.setFromColor(slot.data.darkColor); return; - case MixBlend.setup: + case MixBlend.first: var light = slot.color, dark = slot.darkColor, setupLight = slot.data.color, setupDark = slot.data.darkColor; light.add((setupLight.r - light.r) * alpha, (setupLight.g - light.g) * alpha, (setupLight.b - light.b) * alpha, (setupLight.a - light.a) * alpha); dark.add((setupDark.r - dark.r) * alpha, (setupDark.g - dark.g) * alpha, (setupDark.b - dark.b) * alpha, 0); @@ -1052,7 +1052,7 @@ var spine; constraint.scaleMix = data.scaleMix; constraint.shearMix = data.shearMix; return; - case MixBlend.setup: + case MixBlend.first: constraint.rotateMix += (data.rotateMix - constraint.rotateMix) * alpha; constraint.translateMix += (data.translateMix - constraint.translateMix) * alpha; constraint.scaleMix += (data.scaleMix - constraint.scaleMix) * alpha; diff --git a/spine-ts/build/spine-widget.js b/spine-ts/build/spine-widget.js index 52c87fc81..6651748f2 100644 --- a/spine-ts/build/spine-widget.js +++ b/spine-ts/build/spine-widget.js @@ -565,7 +565,7 @@ var spine; slot.color.setFromColor(slot.data.color); slot.darkColor.setFromColor(slot.data.darkColor); return; - case MixBlend.setup: + case MixBlend.first: var light = slot.color, dark = slot.darkColor, setupLight = slot.data.color, setupDark = slot.data.darkColor; light.add((setupLight.r - light.r) * alpha, (setupLight.g - light.g) * alpha, (setupLight.b - light.b) * alpha, (setupLight.a - light.a) * alpha); dark.add((setupDark.r - dark.r) * alpha, (setupDark.g - dark.g) * alpha, (setupDark.b - dark.b) * alpha, 0); @@ -1052,7 +1052,7 @@ var spine; constraint.scaleMix = data.scaleMix; constraint.shearMix = data.shearMix; return; - case MixBlend.setup: + case MixBlend.first: constraint.rotateMix += (data.rotateMix - constraint.rotateMix) * alpha; constraint.translateMix += (data.translateMix - constraint.translateMix) * alpha; constraint.scaleMix += (data.scaleMix - constraint.scaleMix) * alpha;