diff options
author | Campbell Barton <campbell@blender.org> | 2022-08-28 13:52:28 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-08-28 13:52:28 +0300 |
commit | 28750bcf7e8b73d9da015898a3c0f21ef5d761f2 (patch) | |
tree | 45c9c2b24632d811fd6a4eca84a0a9818b9fc47b /source/blender/blenlib/intern | |
parent | 7269ee4dbbc2d46eee864029772aa0e167cd267a (diff) |
Cleanup: replace NULL with nullptr for C++ files
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r-- | source/blender/blenlib/intern/mesh_intersect.cc | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/task_pool.cc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenlib/intern/mesh_intersect.cc b/source/blender/blenlib/intern/mesh_intersect.cc index d5585f953ec..e8aa359fbe4 100644 --- a/source/blender/blenlib/intern/mesh_intersect.cc +++ b/source/blender/blenlib/intern/mesh_intersect.cc @@ -710,7 +710,7 @@ bool IMesh::erase_face_positions(int f_index, Span<bool> face_pos_erase, IMeshAr * mark with null pointer and caller should call remove_null_faces(). * the loop is done. */ - this->face_[f_index] = NULL; + this->face_[f_index] = nullptr; return true; } Array<const Vert *> new_vert(new_len); diff --git a/source/blender/blenlib/intern/task_pool.cc b/source/blender/blenlib/intern/task_pool.cc index a29dbe95ba9..c335d04413c 100644 --- a/source/blender/blenlib/intern/task_pool.cc +++ b/source/blender/blenlib/intern/task_pool.cc @@ -84,11 +84,11 @@ class Task { free_taskdata(other.free_taskdata), freedata(other.freedata) { - ((Task &)other).pool = NULL; - ((Task &)other).run = NULL; - ((Task &)other).taskdata = NULL; + ((Task &)other).pool = nullptr; + ((Task &)other).run = nullptr; + ((Task &)other).taskdata = nullptr; ((Task &)other).free_taskdata = false; - ((Task &)other).freedata = NULL; + ((Task &)other).freedata = nullptr; } #else Task(const Task &other) = delete; |