Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a problem of Mask on the native platform. #1899

Merged
merged 2 commits into from Oct 25, 2019

Conversation

caryliu1999
Copy link
Contributor

@caryliu1999 caryliu1999 commented Oct 23, 2019

Re: cocos-creator/2d-tasks#1972

修改说明:
因为Mask结束之后ModelBatcher中的材质没有重置, 导致Mask的子节点跟后续节点自动合批。

目前js层的Mask及ModelBatcher改动比较大,原生还没完全同步,涉及的内容比较多,在后续版本统一同步。

@holycanvas holycanvas merged commit 103dde2 into cocos:v2.2.1-release Oct 25, 2019
1 check passed
@caryliu1999 caryliu1999 deleted the v2.2.1-release-mask branch Jun 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants