Browse Source

Merge branch '4.1' into 4.2-beta

# Conflicts:
#	spine-flutter/CHANGELOG.md
#	spine-flutter/pubspec.yaml
Mario Zechner 1 year ago
parent
commit
bdf6d6293d
2 changed files with 8 additions and 2 deletions
  1. 7 1
      spine-flutter/CHANGELOG.md
  2. 1 1
      spine-flutter/lib/spine_flutter.dart

+ 7 - 1
spine-flutter/CHANGELOG.md

@@ -1,4 +1,7 @@
-#4.2.21
+# 4.2.22
+* Fix multiply blend mode, see https://esotericsoftware.com/forum/d/25369-spine-flutter-slot%E6%B7%B7%E5%90%88%E6%A8%A1%E5%BC%8F%E5%90%8Ealpha%E4%B8%A2%E5%A4%B1/2
+
+# 4.2.21
 * FilterQuality for texture atlas pages is now set to medium. It is configurable via `Atlas.filterQuality`. See https://github.com/EsotericSoftware/spine-runtimes/issues/2362
 * Track Entry listeners are now invoked properly, see https://github.com/EsotericSoftware/spine-runtimes/issues/2349
 
@@ -11,6 +14,9 @@
 # 4.2.18
 * Fixes compilation errors due to API change in Flutter 3.16.0, see [this issue](https://github.com/EsotericSoftware/spine-runtimes/issues/2420). **Note**: Depending on this version requires your project to depend on Flutter >= 3.16.0 as well.
 
+# 4.1.13
+* Fix multiply blend mode, see https://esotericsoftware.com/forum/d/25369-spine-flutter-slot%E6%B7%B7%E5%90%88%E6%A8%A1%E5%BC%8F%E5%90%8Ealpha%E4%B8%A2%E5%A4%B1/2
+
 # 4.1.12
 * FilterQuality for texture atlas pages is now set to medium. It is configurable via `Atlas.filterQuality`. See https://github.com/EsotericSoftware/spine-runtimes/issues/2362
 * Track Entry listeners are now invoked properly, see https://github.com/EsotericSoftware/spine-runtimes/issues/2349

+ 1 - 1
spine-flutter/lib/spine_flutter.dart

@@ -551,7 +551,7 @@ class SkeletonData {
 enum BlendMode {
   normal(0, rendering.BlendMode.srcOver),
   additive(1, rendering.BlendMode.plus),
-  multiply(2, rendering.BlendMode.modulate),
+  multiply(2, rendering.BlendMode.multiply),
   screen(3, rendering.BlendMode.screen);
 
   final int value;