Revert "Added cascadeContentSizeEnabled property so that the original, default behaviour is left intact. Setting this new property to YES will cause contentSize changes to propagate down."

This reverts commit 554fcde.

Author: Birkemose

cocos2d/CCNode.h

@@ -212,9 +212,6 @@
 
 	// Opacity/Color propagates into children that conform to if cascadeOpacity/cascadeColor is enabled.
 	BOOL		_cascadeColorEnabled, _cascadeOpacityEnabled;
-    
-    // contentSize changes don't propogate to children unless cascadeContentSize is enabled.
-    BOOL        _cascadeContentSizeEnabled;
 
 @private
 	// Physics Body.
@@ -389,12 +386,9 @@
 /// -----------------------------------------------------------------------
 
 /** The untransformed size of the node in the unit specified by contentSizeType property.
- The contentSize remains the same regardless of whether the node is scaled or rotated.  Changes to contentSize will not affect
- children unless the property cascadeContentSize is enabled.
+ The contentSize remains the same regardless of whether the node is scaled or rotated.
  @see contentSizeInPoints
- @see contentSizeType
- @see cascadeContentSizeEnabled
- */
+ @see contentSizeType */
 @property (nonatomic,readwrite,assign) CGSize contentSize;
 
 /** The untransformed size of the node in Points. The contentSize remains the same regardless of whether the node is scaled or rotated.
@@ -410,12 +404,6 @@
  @see contentSizeInPoints */
 @property (nonatomic,readwrite,assign) CCSizeType contentSizeType;
 
-/**
- cascadeContentSizeEnabled causes changes to this node's contentSize to cascade down to it's children.
- @see contentSize
- */
-@property (nonatomic, getter = isCascadeContentSizeEnabled) BOOL cascadeContentSizeEnabled;
-
 /**
  * Invoked automatically when the OS view has been resized.
  *

cocos2d/CCNode.m

@@ -187,7 +187,6 @@ -(id) init
 		_displayColor = _color = [CCColor whiteColor].ccColor4f;
 		_cascadeOpacityEnabled = NO;
 		_cascadeColorEnabled = NO;
-        _cascadeContentSizeEnabled = NO;
 	}
 
 	return self;
@@ -400,11 +399,12 @@ - (void) contentSizeChanged
     {
         [child parentsContentSizeChanged];
     }
+    
 }
 
 - (void) parentsContentSizeChanged
         {
-    if (!CCSizeTypeIsBasicPoints(_contentSizeType) && (_cascadeContentSizeEnabled == YES))
+    if (!CCSizeTypeIsBasicPoints(_contentSizeType))
     {
         [self contentSizeChanged];
         }
@@ -1679,7 +1679,6 @@ - (BOOL)hitTestWithWorldPos:(CGPoint)pos
 
 @synthesize cascadeColorEnabled=_cascadeColorEnabled;
 @synthesize cascadeOpacityEnabled=_cascadeOpacityEnabled;
-@synthesize cascadeContentSizeEnabled=_cascadeContentSizeEnabled;
 
 -(CGFloat) opacity
 {