|
@@ -308,6 +308,9 @@
|
|
public clone(): Animation {
|
|
public clone(): Animation {
|
|
var clone = new Animation(this.name, this.targetPropertyPath.join("."), this.framePerSecond, this.dataType, this.loopMode);
|
|
var clone = new Animation(this.name, this.targetPropertyPath.join("."), this.framePerSecond, this.dataType, this.loopMode);
|
|
|
|
|
|
|
|
+ clone.enableBlending = this.enableBlending;
|
|
|
|
+ clone.blendingSpeed = this.blendingSpeed;
|
|
|
|
+
|
|
if (this._keys) {
|
|
if (this._keys) {
|
|
clone.setKeys(this._keys);
|
|
clone.setKeys(this._keys);
|
|
}
|
|
}
|
|
@@ -658,6 +661,8 @@
|
|
serializationObject.framePerSecond = this.framePerSecond;
|
|
serializationObject.framePerSecond = this.framePerSecond;
|
|
serializationObject.dataType = this.dataType;
|
|
serializationObject.dataType = this.dataType;
|
|
serializationObject.loopBehavior = this.loopMode;
|
|
serializationObject.loopBehavior = this.loopMode;
|
|
|
|
+ serializationObject.enableBlending = this.enableBlending;
|
|
|
|
+ serializationObject.blendingSpeed = this.blendingSpeed;
|
|
|
|
|
|
var dataType = this.dataType;
|
|
var dataType = this.dataType;
|
|
serializationObject.keys = [];
|
|
serializationObject.keys = [];
|
|
@@ -755,6 +760,14 @@
|
|
var data;
|
|
var data;
|
|
var index: number;
|
|
var index: number;
|
|
|
|
|
|
|
|
+ if (parsedAnimation.enableBlending) {
|
|
|
|
+ animation.enableBlending = parsedAnimation.enableBlending;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (parsedAnimation.blendingSpeed) {
|
|
|
|
+ animation.blendingSpeed = parsedAnimation.blendingSpeed;
|
|
|
|
+ }
|
|
|
|
+
|
|
for (index = 0; index < parsedAnimation.keys.length; index++) {
|
|
for (index = 0; index < parsedAnimation.keys.length; index++) {
|
|
var key = parsedAnimation.keys[index];
|
|
var key = parsedAnimation.keys[index];
|
|
|
|
|