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

avoid releasing builtin asset #4915

Merged
merged 1 commit into from Jul 25, 2019

Conversation

@holycanvas
Copy link
Contributor

commented Jul 19, 2019

Re: cocos-creator/2d-tasks#
https://forum.cocos.com/t/ccc2-1-2/80789
Changes:

  • 避免释放内部资源
refine
@holycanvas holycanvas force-pushed the holycanvas:v2.1.2-release branch from 7c3746c to 0c0a815 Jul 25, 2019
@2youyou2 2youyou2 merged commit e227699 into cocos-creator:v2.1.3 Jul 25, 2019
1 check passed
1 check passed
ci/circleci: test Your tests passed on CircleCI!
Details
jareguo added a commit that referenced this pull request Aug 2, 2019
* commit 'a3de003db47b4afa537a97b829ad75069f48be95':
  fix browser breaking when playing audio on uc browser (#5048)
  fix vec2、vec3、vec4 parameters type error (#5064)
  Fix call node targetOff func has not remove node from target.__eventTargets array (#5052)
  add play and stop sub particle for editor mode (#5031)
  fix IE11's not supporting to Array.includes (#5033)
  fix issue #4942
  BUG FIX: audio fail to register touch event listener && fix audio loading (#4991)
  fix ecScene null (#5000)
  Lifecycle: always call start, update, lateUpdate in try catch (#4941)
  Fix a memory leak caused by the render-data not being properly released! (#5025)
  avoid releasing builtin asset (#4915)
  fix auto sync prefab rotation and z invalid (#4975)
  revert fix pageview inertia invalid (#4945) (#4968)
  refine code (#4964)
  fix pageview inertia invalid (#4945)

# Conflicts:
#	cocos2d/audio/CCAudio.js
#	cocos2d/core/graphics/graphics.js
#	cocos2d/core/load-pipeline/audio-downloader.js
#	cocos2d/core/platform/CCSys.js
#	cocos2d/core/renderer/index.js
#	cocos2d/core/utils/prefab-helper.js
#	cocos2d/renderer/render-data/render-data.js
#	cocos2d/tilemap/CCTiledMap.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.