| commit | 85e3fa7ed1a2d59d15336f46f41c55ad874ceaa6 | [log] [tgz] |
|---|---|---|
| author | hernan <hernantorrisi@gmail.com> | Thu Jul 26 19:17:04 2018 -0400 |
| committer | hernan <hernantorrisi@gmail.com> | Thu Jul 26 19:17:04 2018 -0400 |
| tree | eb9bb816fcba60c071900fad6dec1e347a355b81 | |
| parent | b6fcfcc2905b522d90a10ea964eafbc0d9ca1eda [diff] | |
| parent | c2ade78043a1a1ba8cf45c6a819ed19374900b04 [diff] |
Merge branch '67_gradients_canvas'
diff --git a/player/js/elements/svgElements/SVGShapeElement.js b/player/js/elements/svgElements/SVGShapeElement.js index a2bddbb..57eadb4 100644 --- a/player/js/elements/svgElements/SVGShapeElement.js +++ b/player/js/elements/svgElements/SVGShapeElement.js
@@ -300,6 +300,6 @@ SVGShapeElement.prototype.destroy = function(){ this.destroyBaseElement(); - this.shapeData = null; + this.shapesData = null; this.itemsData = null; };
diff --git a/player/js/utils/expressions/ExpressionManager.js b/player/js/utils/expressions/ExpressionManager.js index c47ef4c..18560e8 100644 --- a/player/js/utils/expressions/ExpressionManager.js +++ b/player/js/utils/expressions/ExpressionManager.js
@@ -571,7 +571,6 @@ if (!thisLayer) { text = elem.layerInterface.text; thisLayer = elem.layerInterface; - console.log(thisLayer) thisComp = elem.comp.compInterface; toWorld = thisLayer.toWorld.bind(thisLayer); fromWorld = thisLayer.fromWorld.bind(thisLayer);