Merge branch 'develop' into reorderSprite

paulsm · Sep 12, 2011 · ae9da10 · ae9da10
2 parents 7796475 + d892281
commit ae9da10
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -19,6 +19,7 @@ Contributors (alphabetically ordered):
 
 * Marco Tillemans (AKA araker: http://www.welcometothefabrik.com/)
 	Texture2D: drawInRect / drawAtPoint disables color state
+	SpriteBatchNode: fixed bug in removeAllChildrenWithCleanup
 
 * slycrel (http://geopherlite.blogspot.com/)
 	Added support for flipped tiles in TMX maps. Also added test case

diff --git a/CHANGELOG b/CHANGELOG
@@ -10,6 +10,7 @@ version 1.1 - XX-Ago-2011
 . [FIX] FileUtils: renamed ccRemoveSuffixFromFile to +[CCFileUtils removeSuffixFromFile:];
 . [FIX] FileUtils: localized resources can be loaded using fullPathFromRelativePath (issue #1230)
 . [FIX] LayerColor: init calls initWithColor:width:height (issue #1226)
+. [FIX] SpriteBatchNode: removeAllChildrenWithCleanup works correctly (issue #1216)
 . [FIX] Texture2D: drawAtPoint uses the correct vertices
 . [FIX] Texture2D: drawAtPoint, drawInRect disables color state (issue #1222)
 . [FIX-MAC] Director: Only call set setAcceptsTouchEvents: when OS X >= 10.6 (issue #1225)

diff --git a/cocos2d/CCSpriteBatchNode.m b/cocos2d/CCSpriteBatchNode.m
@@ -222,10 +222,11 @@ -(void)removeChildAtIndex:(NSUInteger)index cleanup:(BOOL)doCleanup
 -(void)removeAllChildrenWithCleanup:(BOOL)doCleanup
 {
 	// Invalidate atlas index. issue #569
-	[children_ makeObjectsPerformSelector:@selector(useSelfRender)];
-
+	// useSelfRender should be performed on all descendants. issue #1216
+	[descendants_ makeObjectsPerformSelector:@selector(useSelfRender)];
+
 	[super removeAllChildrenWithCleanup:doCleanup];
-	
+
 	[descendants_ removeAllObjects];
 	[textureAtlas_ removeAllQuads];
 }