Merge pull request cocos2d#27 from 2youyouo2/RefreshResSupportInCocos2dx

chengstory · chengstory · commit 893a32102a59 · 2014-05-28T03:59:13.000-05:00
fixed default ScaleFrame's value is 0
diff --git a/extensions/CocoStudio/TimelineAction/CCFrame.cpp b/extensions/CocoStudio/TimelineAction/CCFrame.cpp
@@ -316,8 +316,8 @@ ScaleFrame* ScaleFrame::create()
 }
 
 ScaleFrame::ScaleFrame()
-    : _scaleX(0)
-    , _scaleY(0)
+    : _scaleX(1)
+    , _scaleY(1)
 {
 }
 

Original file line number	Diff line number	Diff line change
`@@ -316,8 +316,8 @@ ScaleFrame* ScaleFrame::create()`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`ScaleFrame::ScaleFrame()`
`319`		`- : _scaleX(0)`
`320`		`- , _scaleY(0)`
	`319`	`+ : _scaleX(1)`
	`320`	`+ , _scaleY(1)`
`321`	`321`	`{`
`322`	`322`	`}`
`323`	`323`