Skip to content

fix CCParticleSystem set material define wrong operation#4888

Merged
jareguo merged 1 commit intococos:v2.1.2-releasefrom
knoxHuang:v2.1.2-release
Jul 16, 2019
Merged

fix CCParticleSystem set material define wrong operation#4888
jareguo merged 1 commit intococos:v2.1.2-releasefrom
knoxHuang:v2.1.2-release

Conversation

@knoxHuang
Copy link
Copy Markdown
Contributor

Re: https://forum.cocos.com/t/2-1-2-bug-demo-07-15/80507/6

Changes:

  • 修复粒子中设置 material define 错误操作,导致会影响到 sprite 的渲染

@jareguo jareguo merged commit b4415d3 into cocos:v2.1.2-release Jul 16, 2019
jareguo added a commit that referenced this pull request Jul 17, 2019
* commit 'db3d5977b188ecda5797db446df9bbd46ce3449f':
  fix CCParticleSystem set material define wrong operation (#4888)
  add Typescript Polyfill to modules.json (#4878)

# Conflicts:
#	modules.json
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.

2 participants