[Bf-blender-cvs] [166c8be7ac0] master: Cleanup: use nullptr
Jacques Lucke
noreply at git.blender.org
Sat Sep 11 12:41:54 CEST 2021
Commit: 166c8be7ac018c461514453b9947a23b7ac2ef26
Author: Jacques Lucke
Date: Sat Sep 11 12:41:46 2021 +0200
Branches: master
https://developer.blender.org/rB166c8be7ac018c461514453b9947a23b7ac2ef26
Cleanup: use nullptr
===================================================================
M source/blender/functions/intern/multi_function_procedure.cc
M source/blender/io/alembic/intern/abc_reader_mesh.cc
===================================================================
diff --git a/source/blender/functions/intern/multi_function_procedure.cc b/source/blender/functions/intern/multi_function_procedure.cc
index e024cee79c8..2aa760a494f 100644
--- a/source/blender/functions/intern/multi_function_procedure.cc
+++ b/source/blender/functions/intern/multi_function_procedure.cc
@@ -242,7 +242,7 @@ void MFProcedure::add_parameter(MFParamType::InterfaceType interface_type, MFVar
void MFProcedure::set_entry(MFInstruction &entry)
{
- if (entry_ != NULL) {
+ if (entry_ != nullptr) {
entry_->prev_.remove_first_occurrence_and_reorder(MFInstructionCursor::ForEntry());
}
entry_ = &entry;
diff --git a/source/blender/io/alembic/intern/abc_reader_mesh.cc b/source/blender/io/alembic/intern/abc_reader_mesh.cc
index dbccc8f2851..eab94139f55 100644
--- a/source/blender/io/alembic/intern/abc_reader_mesh.cc
+++ b/source/blender/io/alembic/intern/abc_reader_mesh.cc
@@ -457,7 +457,7 @@ static void read_velocity(const V3fArraySamplePtr &velocities,
const float velocity_scale)
{
CustomDataLayer *velocity_layer = BKE_id_attribute_new(
- &config.mesh->id, "velocity", CD_PROP_FLOAT3, ATTR_DOMAIN_POINT, NULL);
+ &config.mesh->id, "velocity", CD_PROP_FLOAT3, ATTR_DOMAIN_POINT, nullptr);
float(*velocity)[3] = (float(*)[3])velocity_layer->data;
const int num_velocity_vectors = static_cast<int>(velocities->size());
More information about the Bf-blender-cvs
mailing list