commit 155dd91d505ca8c66e9299c94acc3c00c5347652
author airnan <hernantorrisi@gmail.com> Thu Jun 01 22:32:33 2023 -0400
committer airnan <hernantorrisi@gmail.com> Thu Jun 01 22:32:33 2023 -0400
tree c393f8c7a0650c585bb8d4d9373d18e08b9b911d
parent 9afebd4ed9e09a0321330a6c6e6886d91a26b4e7
parent 806c93981375afe71883574d0f4e52cf5331a24f

Merge branch 'master' into 91_canvas_paint_operations_optimization

player/js/effects/TransformEffect.js

diff --git a/player/js/effects/TransformEffect.js b/player/js/effects/TransformEffect.js
index d4bcc0d..2536ce5 100644
--- a/player/js/effects/TransformEffect.js
+++ b/player/js/effects/TransformEffect.js
@@ -21,8 +21,9 @@
     var effectElements = this.effectsManager.effectElements;
     var anchor = effectElements[0].p.v;
     var position = effectElements[1].p.v;
+    var isUniformScale = effectElements[2].p.v === 1;
     var scaleHeight = effectElements[3].p.v;
-    var scaleWidth = effectElements[4].p.v;
+    var scaleWidth = isUniformScale ? scaleHeight : effectElements[4].p.v;
     var skew = effectElements[5].p.v;
     var skewAxis = effectElements[6].p.v;
     var rotation = effectElements[7].p.v;

player/js/elements/helpers/TransformElement.js

diff --git a/player/js/elements/helpers/TransformElement.js b/player/js/elements/helpers/TransformElement.js
index cbb2391..bc27023 100644
--- a/player/js/elements/helpers/TransformElement.js
+++ b/player/js/elements/helpers/TransformElement.js
@@ -70,7 +70,8 @@
           if (this.localTransforms[i]._mdf) {
             this.finalTransform._localMatMdf = true;
           }
-          if (this.localTransforms[i]._opMdf) {
+          if (this.localTransforms[i]._opMdf && !this.finalTransform._opMdf) {
+            this.finalTransform.localOpacity = this.finalTransform.mProp.o.v;
             this.finalTransform._opMdf = true;
           }
           i += 1;