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

should not clear builtins in editor #4509

Merged

Conversation

@2youyou2
Copy link
Collaborator

commented May 28, 2019

Re: cocos-creator/2d-tasks#

Changes:

  • should not clear builtins in editor

@pandamicro pandamicro merged commit 89d2fa9 into cocos-creator:v2.1.2 May 28, 2019

1 check passed

ci/circleci: test Your tests passed on CircleCI!
Details

jareguo added a commit that referenced this pull request May 28, 2019

Merge v2.1.2 into v2.2.0
* commit '51bdc40c2d80ef3da5c8e6cce6c0feb13097b693':
  refine eulerAngles api doc (#4489)
  should not clear builtins in editor (#4509)
  fixed error when call restart (#4479)

# Conflicts:
#	cocos2d/renderer/renderers/forward-renderer.js
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.