Merge branch 'master' into dev

Conflicts: CHANGELOG.md flixel/FlxG.hx flixel/system/frontEnds/BitmapFrontEnd.hx
HaxeFlixel · Nov 20, 2014 · 3910e2b · sruloart · Nov 20, 2014 · mrcdk
2 parents 10782de + fd4634e
commit 3910e2b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -232,6 +232,11 @@
 * `FlxAnalog` and `FlxVirtualPad` have their own atlas with default graphic, so they propduce less drawcalls
 * Added `FlxSpriteButton` which is button which label is a simple `FlxSprite`. It have useful `createTextLabel()` method, which generates sprite with text graphic
 
+3.3.6
+------------------------------
+* Compatibility fix for OpenFL 2.1.6
+
+
 3.3.5
 ------------------------------
 * FlxTilemap:

diff --git a/flixel/system/frontEnds/BitmapFrontEnd.hx b/flixel/system/frontEnds/BitmapFrontEnd.hx
@@ -333,14 +333,25 @@ class BitmapFrontEnd
 		if ((key != null) && _cache.exists(key))
 		{
 			var obj:FlxGraphic = _cache.get(key);
-			#if !nme
-			Assets.cache.bitmapData.remove(key);
-			#end
+			removeFromOpenFLCache(key);
 			_cache.remove(key);
 			obj.destroy();
 		}
 	}
 
+	private function removeFromOpenFLCache(key:String):Void
+	{
+		#if nme
+			return;
+		#end
+
+		#if (openfl <= "2.1.5")
+			Assets.cache.bitmapData.remove(key);
+		#else
+			Assets.cache.removeBitmapData(key);
+		#end
+	}
+
 	public function removeIfNoUse(graphic:FlxGraphic):Void
 	{
 		if (graphic != null && graphic.useCount == 0)

diff --git a/haxelib.json b/haxelib.json
@@ -4,8 +4,8 @@
 	"license": "MIT",
 	"tags": ["game", "openfl", "flash", "neko", "cpp", "android", "ios", "cross"],
 	"description": "HaxeFlixel is a 2D game framework based on OpenFL that delivers cross-platform games.",
-	"version": "3.3.5",
-	"releasenote": "Several bugfixes, see the CHANGELOG.md for more details.",
+	"version": "3.3.6",
+	"releasenote": "Compatibility fix for OpenFL 2.1.6.",
 	"contributors": ["haxeflixel"],
 	"dependencies": { "lime": "", "openfl": "" }
 }