Fix to make opacity from the parent CCNode cascade to CCNodeColor and CCNodeGradient

Author: RobBoluga

cocos2d/CCNodeColor.m

@@ -134,6 +134,13 @@ -(void) setOpacity: (CGFloat) opacity
 	[super setOpacity:opacity];
 	[self updateColor];
 }
+
+- (void)updateDisplayedOpacity:(CGFloat)parentOpacity
+{
+    [super updateDisplayedOpacity:parentOpacity];
+    [self updateColor];
+}
+
 @end
 
 
@@ -185,9 +192,9 @@ - (void) updateColor
 
 	float gmin = MIN(MIN(g0, g1), MIN(g2, g3));
 	float gmax = MAX(MAX(g0, g1), MAX(g2, g3));
-	
-	GLKVector4 a = GLKVector4Make(_color.r*_color.a, _color.g*_color.a, _color.b*_color.a, _color.a);
-	GLKVector4 b = GLKVector4Make(_endColor.r*_endColor.a, _endColor.g*_endColor.a, _endColor.b*_endColor.a, _endColor.a);
+	NSLog(@"RCB");
+	GLKVector4 a = GLKVector4Make(_color.r*_color.a*_displayColor.a, _color.g*_color.a*_displayColor.a, _color.b*_color.a*_displayColor.a, _color.a*_displayColor.a);
+	GLKVector4 b = GLKVector4Make(_endColor.r*_endColor.a*_displayColor.a, _endColor.g*_endColor.a*_displayColor.a, _endColor.b*_endColor.a*_displayColor.a, _endColor.a*_displayColor.a);
 	_colors[0] =  GLKVector4Lerp(a, b, (g0 - gmin)/(gmax - gmin));
 	_colors[1] =  GLKVector4Lerp(a, b, (g1 - gmin)/(gmax - gmin));
 	_colors[2] =  GLKVector4Lerp(a, b, (g2 - gmin)/(gmax - gmin));
@@ -237,6 +244,12 @@ -(void) setEndOpacity: (CGFloat) o
 	[self updateColor];
 }
 
+- (void)updateDisplayedOpacity:(CGFloat)parentOpacity
+{
+    [super updateDisplayedOpacity:parentOpacity];
+    [self updateColor];
+}
+
 -(void) setVector: (CGPoint) v
 {
 	_vector = v;