Browse Source

[cocos2dx] Fixes #1229, tint black calculation was incorrect.

badlogic 6 years ago
parent
commit
a4a36d81a3
1 changed files with 6 additions and 6 deletions
  1. 6 6
      spine-cocos2dx/src/spine/SkeletonRenderer.cpp

+ 6 - 6
spine-cocos2dx/src/spine/SkeletonRenderer.cpp

@@ -405,13 +405,13 @@ namespace spine {
 			}
 			float multiplier = _premultipliedAlpha ? alpha : 255;
 			
-			float red = nodeColor.r * _skeleton->color.r * slot->color.r * multiplier;
-			float green = nodeColor.g * _skeleton->color.g * slot->color.g * multiplier;
-			float blue = nodeColor.b * _skeleton->color.b * slot->color.b * multiplier;
+			float red = nodeColor.r * _skeleton->color.r * color.r * multiplier;
+			float green = nodeColor.g * _skeleton->color.g * color.g * multiplier;
+			float blue = nodeColor.b * _skeleton->color.b * color.b * multiplier;
 			
-			color.r = red * color.r;
-			color.g = green * color.g;
-			color.b = blue * color.b;
+			color.r = red * slot->color.r;
+			color.g = green * slot->color.g;
+			color.b = blue * slot->color.b;
 			color.a = alpha;
 			
 			if (slot->darkColor) {