Merge pull request cocos2d#3988 from lite3/develop

James Chen · James Chen · commit 7269d94d2ede · 2013-10-24T03:01:49.000-07:00
closed cocos2d#3060: The Node's anchor point was changed after being added to ScrollView.
diff --git a/extensions/GUI/CCScrollView/CCScrollView.cpp b/extensions/GUI/CCScrollView/CCScrollView.cpp
@@ -469,8 +469,6 @@ void ScrollView::updateInset()
  */
 void ScrollView::addChild(Node * child, int zOrder, int tag)
 {
-    child->ignoreAnchorPointForPosition(false);
-    child->setAnchorPoint(Point(0.0f, 0.0f));
     if (_container != child) {
         _container->addChild(child, zOrder, tag);
     } else {

Original file line number	Diff line number	Diff line change
`@@ -469,8 +469,6 @@ void ScrollView::updateInset()`
`469`	`469`	`*/`
`470`	`470`	`void ScrollView::addChild(Node * child, int zOrder, int tag)`
`471`	`471`	`{`
`472`		`- child->ignoreAnchorPointForPosition(false);`
`473`		`- child->setAnchorPoint(Point(0.0f, 0.0f));`
`474`	`472`	`if (_container != child) {`
`475`	`473`	`_container->addChild(child, zOrder, tag);`
`476`	`474`	`} else {`