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/blenkernel | |
parent | 7269ee4dbbc2d46eee864029772aa0e167cd267a (diff) |
Cleanup: replace NULL with nullptr for C++ files
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/asset_catalog.cc | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/image.cc | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mball.cc | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_wrapper.cc | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/asset_catalog.cc b/source/blender/blenkernel/intern/asset_catalog.cc index fccff602d2e..f7b14cc3479 100644 --- a/source/blender/blenkernel/intern/asset_catalog.cc +++ b/source/blender/blenkernel/intern/asset_catalog.cc @@ -516,7 +516,7 @@ CatalogFilePath AssetCatalogService::find_suitable_cdf_path_for_writing( sizeof(asset_lib_cdf_path), suitable_root_path, DEFAULT_CATALOG_FILENAME.c_str(), - NULL); + nullptr); return asset_lib_cdf_path; } diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc index d6caec86b5d..ae24383e5b9 100644 --- a/source/blender/blenkernel/intern/image.cc +++ b/source/blender/blenkernel/intern/image.cc @@ -1248,7 +1248,7 @@ Image *BKE_image_add_generated(Main *bmain, static void image_colorspace_from_imbuf(Image *image, const ImBuf *ibuf) { - const char *colorspace_name = NULL; + const char *colorspace_name = nullptr; if (ibuf->rect_float) { if (ibuf->float_colorspace) { diff --git a/source/blender/blenkernel/intern/mball.cc b/source/blender/blenkernel/intern/mball.cc index 1a2b4b22080..2ff8e6fc061 100644 --- a/source/blender/blenkernel/intern/mball.cc +++ b/source/blender/blenkernel/intern/mball.cc @@ -250,10 +250,10 @@ MetaElem *BKE_mball_element_add(MetaBall *mb, const int type) BoundBox *BKE_mball_boundbox_get(Object *ob) { BLI_assert(ob->type == OB_MBALL); - if (ob->runtime.bb != NULL && (ob->runtime.bb->flag & BOUNDBOX_DIRTY) == 0) { + if (ob->runtime.bb != nullptr && (ob->runtime.bb->flag & BOUNDBOX_DIRTY) == 0) { return ob->runtime.bb; } - if (ob->runtime.bb == NULL) { + if (ob->runtime.bb == nullptr) { ob->runtime.bb = MEM_cnew<BoundBox>(__func__); } @@ -682,7 +682,7 @@ void BKE_mball_data_update(Depsgraph *depsgraph, Scene *scene, Object *ob) } Mesh *mesh = BKE_mball_polygonize(depsgraph, scene, ob); - if (mesh == NULL) { + if (mesh == nullptr) { return; } @@ -693,14 +693,14 @@ void BKE_mball_data_update(Depsgraph *depsgraph, Scene *scene, Object *ob) if (ob->parent && ob->parent->type == OB_LATTICE && ob->partype == PARSKEL) { int verts_num; float(*positions)[3] = BKE_mesh_vert_coords_alloc(mesh, &verts_num); - BKE_lattice_deform_coords(ob->parent, ob, positions, verts_num, 0, NULL, 1.0f); + BKE_lattice_deform_coords(ob->parent, ob, positions, verts_num, 0, nullptr, 1.0f); BKE_mesh_vert_coords_apply(mesh, positions); MEM_freeN(positions); } ob->runtime.geometry_set_eval = new GeometrySet(GeometrySet::create_with_mesh(mesh)); - if (ob->runtime.bb == NULL) { + if (ob->runtime.bb == nullptr) { ob->runtime.bb = MEM_cnew<BoundBox>(__func__); } blender::float3 min(std::numeric_limits<float>::max()); diff --git a/source/blender/blenkernel/intern/mesh_wrapper.cc b/source/blender/blenkernel/intern/mesh_wrapper.cc index 989cd5f1df1..19d4444aa2f 100644 --- a/source/blender/blenkernel/intern/mesh_wrapper.cc +++ b/source/blender/blenkernel/intern/mesh_wrapper.cc @@ -343,7 +343,7 @@ static Mesh *mesh_wrapper_ensure_subdivision(Mesh *me) if (use_clnors) { float(*lnors)[3] = static_cast<float(*)[3]>( CustomData_get_layer(&subdiv_mesh->ldata, CD_NORMAL)); - BLI_assert(lnors != NULL); + BLI_assert(lnors != nullptr); BKE_mesh_set_custom_normals(subdiv_mesh, lnors); CustomData_set_layer_flag(&me->ldata, CD_NORMAL, CD_FLAG_TEMPORARY); CustomData_set_layer_flag(&subdiv_mesh->ldata, CD_NORMAL, CD_FLAG_TEMPORARY); |