Merge remote-tracking branch 'upstream/upkeep-6-1' into merge-from-upstream

Author: MAJigsaw77

flixel/addons/display/FlxNestedSprite.hx

@@ -1,7 +1,5 @@
 package flixel.addons.display;
 
-import flixel.util.FlxDirectionFlags;
-import openfl.geom.ColorTransform;
 import flixel.FlxBasic;
 import flixel.FlxG;
 import flixel.FlxSprite;
@@ -12,6 +10,8 @@ import flixel.math.FlxVelocity;
 import flixel.system.FlxAssets.FlxGraphicAsset;
 import flixel.util.FlxColor;
 import flixel.util.FlxDestroyUtil;
+import flixel.util.FlxDirectionFlags;
+import openfl.geom.ColorTransform;
 
 using flixel.util.FlxArrayUtil;
 
@@ -297,6 +297,7 @@ class FlxNestedSprite extends FlxSprite
 			var green:Float = (color >> 8 & 0xff) * _parentGreen / 255;
 			var blue:Float = (color & 0xff) * _parentBlue / 255;
 
+			#if (flixel < version("6.1.0"))
 			if (colorTransform == null)
 			{
 				colorTransform = new ColorTransform(red, green, blue, alpha);
@@ -309,9 +310,16 @@ class FlxNestedSprite extends FlxSprite
 				colorTransform.alphaMultiplier = alpha;
 			}
 			useColorTransform = true;
+			#else
+			colorTransform.redMultiplier = red;
+			colorTransform.greenMultiplier = green;
+			colorTransform.blueMultiplier = blue;
+			colorTransform.alphaMultiplier = alpha;
+			#end
 		}
 		else
 		{
+			#if (flixel < version("6.1.0"))
 			if (colorTransform != null)
 			{
 				colorTransform.redMultiplier = 1;
@@ -320,6 +328,12 @@ class FlxNestedSprite extends FlxSprite
 				colorTransform.alphaMultiplier = 1;
 			}
 			useColorTransform = false;
+			#else
+			colorTransform.redMultiplier = 1;
+			colorTransform.greenMultiplier = 1;
+			colorTransform.blueMultiplier = 1;
+			colorTransform.alphaMultiplier = 1;
+			#end
 		}
 		dirty = true;
 
@@ -348,6 +362,7 @@ class FlxNestedSprite extends FlxSprite
 		color = combinedColor;
 		if ((alpha != 1) || (color != 0x00ffffff))
 		{
+			#if (flixel < version("6.1.0"))
 			if (colorTransform == null)
 			{
 				colorTransform = new ColorTransform(combinedRed, combinedGreen, combinedBlue, alpha);
@@ -360,9 +375,16 @@ class FlxNestedSprite extends FlxSprite
 				colorTransform.alphaMultiplier = alpha;
 			}
 			useColorTransform = true;
+			#else
+			colorTransform.redMultiplier = combinedRed;
+			colorTransform.greenMultiplier = combinedGreen;
+			colorTransform.blueMultiplier = combinedBlue;
+			colorTransform.alphaMultiplier = alpha;
+			#end
 		}
 		else
 		{
+			#if (flixel < version("6.1.0"))
 			if (colorTransform != null)
 			{
 				colorTransform.redMultiplier = 1;
@@ -371,6 +393,12 @@ class FlxNestedSprite extends FlxSprite
 				colorTransform.alphaMultiplier = 1;
 			}
 			useColorTransform = false;
+			#else
+			colorTransform.redMultiplier = 1;
+			colorTransform.greenMultiplier = 1;
+			colorTransform.blueMultiplier = 1;
+			colorTransform.alphaMultiplier = 1;
+			#end
 		}
 
 		dirty = true;