Revert Asset and Source to their original types, use FlxAssets.resolveBitmapData instead.

Author: rifxii

flixel/system/FlxAssets.hx

@@ -36,20 +36,20 @@ class VirtualInputData extends #if nme ByteArray #else ByteArrayData #end {}
 typedef FlxTexturePackerJsonAsset = FlxJsonAsset<TexturePackerAtlas>;
 typedef FlxAsepriteJsonAsset = FlxJsonAsset<AseAtlas>;
 typedef FlxSoundAsset = OneOfThree<String, Sound, Class<Sound>>;
+typedef FlxGraphicAsset = OneOfFour<FlxGraphic, BitmapData, String, Class<Dynamic>>;
 typedef FlxTilemapGraphicAsset = OneOfFour<FlxFramesCollection, FlxGraphic, BitmapData, String>;
 typedef FlxBitmapFontGraphicAsset = OneOfFour<FlxFrame, FlxGraphic, BitmapData, String>;
 
-abstract FlxGraphicAsset(OneOfFour<FlxGraphic, BitmapData, String, Class<Dynamic>>) from FlxGraphic from BitmapData from Class<Dynamic> from String
+@:deprecated("`FlxGraphicSource` is deprecated, use `FlxGraphicAsset` instead")
+abstract FlxGraphicSource(FlxGraphicAsset) from FlxGraphic from BitmapData from Class<Dynamic> from String
 {
+	@:deprecated("`resolveBitmapData` is deprecated, use `FlxAssets.resolveBitmapData` instead")
 	public inline function resolveBitmapData():BitmapData
 	{
 		return FlxAssets.resolveBitmapData(cast this);
 	}
 }
 
-@:deprecated("`FlxGraphicSource` is deprecated, use `FlxGraphicAsset` instead")
-typedef FlxGraphicSource = FlxGraphicAsset;
-
 abstract FlxAngelCodeAsset(OneOfThree<Xml, String, Bytes>) from Xml from String from Bytes
 {
 	public inline function parse()

flixel/system/debug/FlxDebugger.hx

@@ -417,7 +417,7 @@ class FlxDebugger extends openfl.display.Sprite
 
 	public function addWindowToggleButton(window:Window, icon:FlxGraphicAsset):Void
 	{
-		var button = addButton(RIGHT, icon.resolveBitmapData(), window.toggleVisible, true, true);
+		var button = addButton(RIGHT, FlxAssets.resolveBitmapData(icon), window.toggleVisible, true, true);
 		window.toggleButton = button;
 		button.toggled = !window.visible;
 	}

flixel/system/debug/interaction/tools/Tool.hx

@@ -45,7 +45,7 @@ class Tool extends Sprite implements IFlxDestroyable
 
 	function setButton(icon:FlxGraphicAsset):Void
 	{
-		button = new FlxSystemButton(icon.resolveBitmapData(), onButtonClicked, true);
+		button = new FlxSystemButton(FlxAssets.resolveBitmapData(icon), onButtonClicked, true);
 		button.toggled = true;
 
 		var tooltipName = _name;

flixel/util/FlxStringUtil.hx

@@ -564,7 +564,7 @@ class FlxStringUtil
 	 */
 	public static function imageToCSV(graphic:FlxGraphicAsset, invert = false, scale = 1, ?colorMap:Array<FlxColor>):String
 	{
-		return bitmapToCSV(graphic.resolveBitmapData(), invert, scale, colorMap);
+		return bitmapToCSV(FlxAssets.resolveBitmapData(graphic), invert, scale, colorMap);
 	}
 
 	/**