diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2020-11-06 19:49:09 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2020-11-06 20:08:25 +0300 |
| commit | 16732def37c5a66f3ea28dbe247b09cc6bca6677 (patch) | |
| tree | 5d14f5c920a1411e336bd80b12becbb3f73de19a /source/blender/blenloader | |
| parent | 88926375a0e4e45f72c87b9e487c060ddd3c9216 (diff) | |
Cleanup: Clang-Tidy modernize-use-nullptr
Replace `NULL` with `nullptr` in C++ code.
No functional changes.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/tests/blendfile_loading_base_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenloader/tests/blendfile_loading_base_test.cc b/source/blender/blenloader/tests/blendfile_loading_base_test.cc index cb5fcdbe3c6..a3aabf6ac10 100644 --- a/source/blender/blenloader/tests/blendfile_loading_base_test.cc +++ b/source/blender/blenloader/tests/blendfile_loading_base_test.cc @@ -127,7 +127,7 @@ bool BlendfileLoadingBaseTest::blendfile_load(const char *filepath) char abspath[FILENAME_MAX]; BLI_path_join(abspath, sizeof(abspath), test_assets_dir.c_str(), filepath, NULL); - bfile = BLO_read_from_file(abspath, BLO_READ_SKIP_NONE, NULL /* reports */); + bfile = BLO_read_from_file(abspath, BLO_READ_SKIP_NONE, nullptr /* reports */); if (bfile == nullptr) { ADD_FAILURE() << "Unable to load file '" << filepath << "' from test assets dir '" << test_assets_dir << "'"; @@ -144,7 +144,7 @@ void BlendfileLoadingBaseTest::blendfile_free() wmWindowManager *wm = static_cast<wmWindowManager *>(bfile->main->wm.first); if (wm != nullptr) { - wm_close_and_free(NULL, wm); + wm_close_and_free(nullptr, wm); } BLO_blendfiledata_free(bfile); bfile = nullptr; |