Cascade for colour and opacity now cascades all children, regardless of their cascade settings

Birkemose · Birkemose · commit 7efa0eab0d96 · 2014-01-27T16:12:44.000+01:00
Former-commit-id: d8b831c
diff --git a/cocos2d/CCNode.m b/cocos2d/CCNode.m
@@ -1580,11 +1580,11 @@ - (void)updateDisplayedColor:(ccColor4F) parentColor
 	_displayColor.g = _color.g * parentColor.g;
 	_displayColor.b = _color.b * parentColor.b;
 	
-	if (_cascadeColorEnabled) {
+	// if (_cascadeColorEnabled) {
 		for (CCNode* item in _children) {
 			[item updateDisplayedColor:_displayColor];
 		}
-	}
+	// }
 }
 
 - (void) cascadeOpacityIfNeeded
@@ -1601,11 +1601,11 @@ - (void)updateDisplayedOpacity:(CGFloat)parentOpacity
 {
 	_displayColor.a = _color.a * parentOpacity;
 	
-	if (_cascadeOpacityEnabled) {
+	// if (_cascadeOpacityEnabled) {
 		for (CCNode* item in _children) {
 			[item updateDisplayedOpacity:_displayColor.a];
 		}
-	}
+	// }
 }
 
 -(void) setOpacityModifyRGB:(BOOL)boolean{

Original file line number	Diff line number	Diff line change
`@@ -1580,11 +1580,11 @@ - (void)updateDisplayedColor:(ccColor4F) parentColor`
`1580`	`1580`	`_displayColor.g = _color.g * parentColor.g;`
`1581`	`1581`	`_displayColor.b = _color.b * parentColor.b;`
`1582`	`1582`
`1583`		`- if (_cascadeColorEnabled) {`
	`1583`	`+ // if (_cascadeColorEnabled) {`
`1584`	`1584`	`for (CCNode* item in _children) {`
`1585`	`1585`	`[item updateDisplayedColor:_displayColor];`
`1586`	`1586`	`}`
`1587`		`- }`
	`1587`	`+ // }`
`1588`	`1588`	`}`
`1589`	`1589`
`1590`	`1590`	`- (void) cascadeOpacityIfNeeded`
`@@ -1601,11 +1601,11 @@ - (void)updateDisplayedOpacity:(CGFloat)parentOpacity`
`1601`	`1601`	`{`
`1602`	`1602`	`_displayColor.a = _color.a * parentOpacity;`
`1603`	`1603`
`1604`		`- if (_cascadeOpacityEnabled) {`
	`1604`	`+ // if (_cascadeOpacityEnabled) {`
`1605`	`1605`	`for (CCNode* item in _children) {`
`1606`	`1606`	`[item updateDisplayedOpacity:_displayColor.a];`
`1607`	`1607`	`}`
`1608`		`- }`
	`1608`	`+ // }`
`1609`	`1609`	`}`
`1610`	`1610`
`1611`	`1611`	`-(void) setOpacityModifyRGB:(BOOL)boolean{`