Skip to content

Commit 1b018b2

Browse files
author
pandamicro
committed
Small fixes
1 parent cfbb0c7 commit 1b018b2

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

cocos2d/actions/CCActionInterval.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3363,7 +3363,7 @@ cc.Animate = cc.ActionInterval.extend(/** @lends cc.Animate# */{
33633363
startWithTarget: function (target) {
33643364
cc.ActionInterval.prototype.startWithTarget.call(this, target);
33653365
if (this._animation.getRestoreOriginalFrame())
3366-
this._origFrame = target.displayFrame();
3366+
this._origFrame = target.getSpriteFrame();
33673367
this._nextFrame = 0;
33683368
this._executedLoops = 0;
33693369
},

cocos2d/core/base-nodes/CCNode.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1717,7 +1717,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
17171717
cc.assert(interval >= 0, cc._LogInfos.Node_schedule_2);
17181718

17191719
interval = interval || 0;
1720-
repeat = (repeat == null) ? cc.REPEAT_FOREVER : repeat;
1720+
repeat = isNaN(repeat) ? cc.REPEAT_FOREVER : repeat;
17211721
delay = delay || 0;
17221722

17231723
this.scheduler.schedule(callback, this, interval, repeat, delay, !this._running, key);

extensions/ccui/base-classes/UIWidgetRenderCmd.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,11 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
9898
};
9999

100100
proto.transform = function (parentCmd, recursive) {
101+
if (!this._transform) {
102+
this._transform = {a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0};
103+
this._worldTransform = {a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0};
104+
}
105+
101106
var node = this._node;
102107
if (node._visible && node._running) {
103108
node._adaptRenderers();

extensions/ccui/layouts/UILayoutWebGLRenderCmd.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777

7878
gl.stencilMask(mask_layer);
7979
gl.clear(gl.STENCIL_BUFFER_BIT);
80-
8180
};
8281

8382
proto._onAfterDrawStencil = function (ctx) {

0 commit comments

Comments
 (0)