From ff569e8a45dff94404e8429abd78df91f85171c2 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Wed, 15 Feb 2017 14:27:10 +0800 Subject: [PATCH] Activate FIX_ARTIFACTS_BY_STRECHING_TEXEL by default --- cocos2d/core/event/event-target.js | 6 ++---- cocos2d/core/platform/CCMacro.js | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cocos2d/core/event/event-target.js b/cocos2d/core/event/event-target.js index 052ad671a4..c5f8070c95 100644 --- a/cocos2d/core/event/event-target.js +++ b/cocos2d/core/event/event-target.js @@ -154,9 +154,8 @@ JS.mixin(EventTarget.prototype, { /** * !#en * Register an callback of a specific event type on the EventTarget. - * This method is merely an alias to addEventListener. * !#zh - * 注册事件目标的特定事件类型回调,仅仅是 addEventListener 的别名。 + * 注册事件目标的特定事件类型回调。 * * @method on * @param {String} type - A string representing the event type to listen for. @@ -213,9 +212,8 @@ JS.mixin(EventTarget.prototype, { /** * !#en * Removes the callback previously registered with the same type, callback, target and or useCapture. - * This method is merely an alias to removeEventListener. * !#zh - * 删除之前与同类型,回调,目标或 useCapture 注册的回调,仅仅是 removeEventListener 的别名。 + * 删除之前与同类型,回调,目标或 useCapture 注册的回调。 * * @method off * @param {String} type - A string representing the event type being removed. diff --git a/cocos2d/core/platform/CCMacro.js b/cocos2d/core/platform/CCMacro.js index ec9240f21c..cd03e0a016 100644 --- a/cocos2d/core/platform/CCMacro.js +++ b/cocos2d/core/platform/CCMacro.js @@ -1661,7 +1661,7 @@ cc.macro = { * * @property {Number} FIX_ARTIFACTS_BY_STRECHING_TEXEL */ - FIX_ARTIFACTS_BY_STRECHING_TEXEL: 0, + FIX_ARTIFACTS_BY_STRECHING_TEXEL: 1, /** * Position of the FPS (Default: 0,0 (bottom-left corner))