Merge pull request cocos2d#2874 from pandamicro/develop

pandamicro · pandamicro · commit bd519eeca93c · 2015-04-29T22:57:03.000+08:00
Fix parser's setAnimationName issue while the property is undefined
diff --git a/extensions/cocostudio/loader/parsers/action-2.x.js b/extensions/cocostudio/loader/parsers/action-2.x.js
@@ -237,7 +237,8 @@
                 frame.setSingleFrameIndex(singleFrameIndex);
 
                 frame.setEnterWithName(true);
-                frame.setAnimationName(currentAnimationFrame);
+                if (currentAnimationFrame)
+                     frame.setAnimationName(currentAnimationFrame);
 
                 return frame;
             }

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,8 @@`
`237`	`237`	`frame.setSingleFrameIndex(singleFrameIndex);`
`238`	`238`
`239`	`239`	`frame.setEnterWithName(true);`
`240`		`- frame.setAnimationName(currentAnimationFrame);`
	`240`	`+ if (currentAnimationFrame)`
	`241`	`+ frame.setAnimationName(currentAnimationFrame);`
`241`	`242`
`242`	`243`	`return frame;`
`243`	`244`	`}`