Merge branch 'flxui_id_name_refactor' into dev

HaxeFlixel · Jan 22, 2015 · 873ed88 · 873ed88
2 parents 5825bb5 + 5202354
commit 873ed88
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Effects/BlendModes/source/PlayState.hx b/Effects/BlendModes/source/PlayState.hx
@@ -4,7 +4,7 @@ import flixel.addons.ui.FlxUIDropDownMenu;
 import flixel.addons.ui.FlxUINumericStepper;
 import flixel.addons.ui.FlxUIState;
 import flixel.addons.ui.interfaces.IFlxUIWidget;
-import flixel.addons.ui.StrIdLabel;
+import flixel.addons.ui.StrNameLabel;
 import flixel.FlxG;
 import flixel.FlxSprite;
 import flixel.FlxState;

diff --git a/Effects/Transitions/source/MenuState.hx b/Effects/Transitions/source/MenuState.hx
@@ -244,7 +244,7 @@ class MenuState extends FlxUIState
 		{
 			case FlxUITypedButton.CLICK_EVENT:
 				var butt:FlxUIButton = cast sender;
-				if (butt.id == "transition")
+				if (butt.name == "transition")
 				{
 					matchUI();
 					transition();