From 789df070c516be9b2e17100026542882bc0c7fde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Mon, 6 Nov 2023 23:21:46 +0100
Subject: [PATCH] Fixed #2116 Apply colortransform after filters

---
 CHANGELOG.md                                                | 1 +
 .../src/com/jpexs/decompiler/flash/timeline/Timeline.java   | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fd41815a..7dc344da2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.
 - [#2021] Indent continuation when using tabs
 - [#2116] DefineEditText display - correct getting fonts
 - [#2116] DefineEditText display - apostroph decoding
+- [#2116] Apply colortransform after filters
 
 
 ## [20.0.0] - 2023-11-05
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java
index c9bb3c58a..be6a56622 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java
@@ -867,6 +867,10 @@ public class Timeline {
             if (blendMode > 1) {
                 clrTrans2 = null;
             }
+            
+            if (filters != null && !filters.isEmpty()) {
+                clrTrans2 = null;
+            }
 
             if (clipDepth > -1) {
                 //Make transparent colors opaque, mask should be only made by shapes
@@ -997,7 +1001,7 @@ public class Timeline {
             if (!(sameImage && canUseSameImage)) {
                 g.setTransform(drawMatrix.toTransform());
 
-                if (blendMode > 1 && clrTrans != null) {
+                if ((blendMode > 1 || (filters != null && !filters.isEmpty())) && clrTrans != null) {
                     img = clrTrans.apply(img);
                 }