Skip to content

Commit c2a3b3a

Browse files
authored
Merge pull request #3352 from pandamicro/develop
Issue fixes
2 parents 9eea0e3 + 447c12a commit c2a3b3a

File tree

6 files changed

+10
-5
lines changed

6 files changed

+10
-5
lines changed

CCBoot.js

+1
Original file line numberDiff line numberDiff line change
@@ -1894,6 +1894,7 @@ var _initSys = function () {
18941894
case sys.BROWSER_TYPE_UNKNOWN:
18951895
case sys.BROWSER_TYPE_360:
18961896
case sys.BROWSER_TYPE_MIUI:
1897+
case sys.BROWSER_TYPE_UC:
18971898
_supportWebGL = false;
18981899
}
18991900
}

cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -465,9 +465,11 @@ cc.Node.RenderCmd.prototype = {
465465
if (colorDirty || opacityDirty)
466466
this._updateColor();
467467

468-
if (locFlag & flags.transformDirty)
469-
//update the transform
468+
if (locFlag & flags.transformDirty) {
469+
//update the transform
470470
this.transform(parentCmd);
471+
this._dirtyFlag = this._dirtyFlag & flags.transformDirty ^ this._dirtyFlag;
472+
}
471473

472474
if (locFlag & flags.orderDirty)
473475
this._dirtyFlag = this._dirtyFlag & flags.orderDirty ^ this._dirtyFlag;

cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
var node = this._node, hasRotation = (node._rotationX || node._rotationY),
9090
layerOrientation = node.layerOrientation,
9191
tiles = node.tiles,
92-
alpha = this._displayedOpacity / 255;
92+
alpha = node._opacity / 255;
9393

9494
if (!tiles || alpha <= 0) {
9595
return;

cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
mapx = ox * a + oy * c + tx,
7777
mapy = ox * b + oy * d + ty;
7878

79-
var opacity = this._displayedOpacity,
79+
var opacity = node._opacity,
8080
cr = this._displayedColor.r,
8181
cg = this._displayedColor.g,
8282
cb = this._displayedColor.b;

extensions/gui/scrollview/CCScrollViewWebGLRenderCmd.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
var node = this._node;
6363
if (node._scissorRestored) { //restore the parent's scissor rect
6464
var rect = node._parentScissorRect;
65-
cc.view.setScissorInPoints(rect.x, rect.y, rect.width, rect.height)
65+
cc.view.setScissorInPoints(rect.x, rect.y, rect.width, rect.height);
6666
}else{
6767
var ctx = cc._renderContext;
6868
ctx.disable(ctx.SCISSOR_TEST);

extensions/gui/scrollview/CCTableView.js

+2
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,8 @@ cc.TableView = cc.ScrollView.extend(/** @lends cc.TableView# */{
520520
this._updateContentSize();
521521
if (this._dataSource.numberOfCellsInTableView(this) > 0)
522522
this.scrollViewDidScroll(this);
523+
524+
this.setNodeDirty();
523525
},
524526

525527
/**

0 commit comments

Comments
 (0)