fixes #1383 enabled property on effects
diff --git a/player/js/elements/svgElements/effects/SVGMatte3Effect.js b/player/js/elements/svgElements/effects/SVGMatte3Effect.js
index da04982..ac20b42 100644
--- a/player/js/elements/svgElements/effects/SVGMatte3Effect.js
+++ b/player/js/elements/svgElements/effects/SVGMatte3Effect.js
@@ -74,10 +74,11 @@
SVGMatte3Effect.prototype.initialize = function() {
var ind = this.filterManager.effectElements[0].p.v;
- var i = 0, len = this.elem.comp.elements.length;
+ var elements = this.elem.comp.elements;
+ var i = 0, len = elements.length;
while (i < len) {
- if (this.elem.comp.elements[i].data.ind === ind) {
- this.setElementAsMask(this.elem, this.elem.comp.elements[i]);
+ if (elements[i] && elements[i].data.ind === ind) {
+ this.setElementAsMask(this.elem, elements[i]);
}
i += 1;
}
diff --git a/player/js/utils/expressions/CompInterface.js b/player/js/utils/expressions/CompInterface.js
index 8f6f015..0a2f2ae 100644
--- a/player/js/utils/expressions/CompInterface.js
+++ b/player/js/utils/expressions/CompInterface.js
@@ -18,6 +18,7 @@
_thisLayerFunction.width = comp.data.w || comp.globalData.compSize.w;
_thisLayerFunction.pixelAspect = 1;
_thisLayerFunction.frameDuration = 1/comp.globalData.frameRate;
+ _thisLayerFunction.displayStartTime = 0;
_thisLayerFunction.numLayers = comp.layers.length;
return _thisLayerFunction;
};
diff --git a/player/js/utils/expressions/EffectInterface.js b/player/js/utils/expressions/EffectInterface.js
index 226549b..8ce4dac 100644
--- a/player/js/utils/expressions/EffectInterface.js
+++ b/player/js/utils/expressions/EffectInterface.js
@@ -73,7 +73,7 @@
return data.np;
}
});
- groupInterface.active = data.en !== 0;
+ groupInterface.active = groupInterface.enabled = data.en !== 0;
return groupInterface;
}
diff --git a/player/js/utils/expressions/ExpressionManager.js b/player/js/utils/expressions/ExpressionManager.js
index 4e9dcbd..98c9422 100644
--- a/player/js/utils/expressions/ExpressionManager.js
+++ b/player/js/utils/expressions/ExpressionManager.js
@@ -342,6 +342,7 @@
var thisProperty = property;
thisProperty.valueAtTime = thisProperty.getValueAtTime;
elem.comp.frameDuration = 1/elem.comp.globalData.frameRate;
+ elem.comp.displayStartTime = 0;
var inPoint = elem.data.ip/elem.comp.globalData.frameRate;
var outPoint = elem.data.op/elem.comp.globalData.frameRate;
var width = elem.data.sw ? elem.data.sw : 0;
