cocos2d::Data fastSet accept nullptr as argument #19047
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stevetranby
added a commit
to stevetranby/cocos2d-x
that referenced
this pull request
Oct 1, 2018
…v3-merging * commit 'a59519a4ef567df7aabac77646d49baa4709ff01': (65 commits) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19082) Fix several bugs with button's title (cocos2d#19073) [android] fix crash when point JNIEnv is a nullptr in getStringUTFCharsJNI func. (cocos2d#19079) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19074) refactor cmake on use libs (cocos2d#19054) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19068) [linux] CCFileUtils::isFileExistInternal should reject a folder (cocos2d#19062) Correct last delta time (cocos2d#18898) Add missing <functional> header which the standard requires and will be necessary to use std::function in VS2019. (cocos2d#18989) fix wrong parameter (cocos2d#19060) DrawNode add isolate flag (cocos2d#19056) Android: CCFileUtils listFiles impl (cocos2d#19044) CameraBackgroundDepthBrush should handle opengl recreate event. (cocos2d#19037) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19052) shorten the android build path, reduce long path error (cocos2d#19045) CCFileUtils: improve thread safety (use single recursive_mutex) (cocos2d#19046) remove assert (cocos2d#19047) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19048) Android: Adds supporting edge screens (cocos2d#19043) cocos2d::Data: prevent use after free. (cocos2d#19034) ... # Conflicts: # build/cocos2d_libs.xcodeproj/project.pbxproj # cocos/3d/Android.mk # cocos/Android.mk # cocos/deprecated/CCDeprecated.h # cocos/editor-support/cocostudio/Android.mk # cocos/editor-support/spine/Android.mk # cocos/platform/android/libcocos2dx-with-controller/build.gradle # cocos/platform/android/libcocos2dx/build.gradle # cocos/ui/UIAbstractCheckButton.cpp # cocos/ui/UIButton.cpp # cocos/ui/UIEditBox/UIEditBox.h # cocos/ui/UIEditBox/UIEditBoxImpl-common.h # extensions/Android.mk # tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp # tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h
huangwei1024
pushed a commit
to huangwei1024/cocos2d-x
that referenced
this pull request
Jun 20, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It's common usage in code