Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2021-09-11 13:41:46 +0300
committerJacques Lucke <jacques@blender.org>2021-09-11 13:41:46 +0300
commit166c8be7ac018c461514453b9947a23b7ac2ef26 (patch)
tree78325cc656682d416add415a9a336df62d19b29c
parentaeeffb935e9406fa2cdcb84828aa0e498b2df664 (diff)
Cleanup: use nullptr
-rw-r--r--source/blender/functions/intern/multi_function_procedure.cc2
-rw-r--r--source/blender/io/alembic/intern/abc_reader_mesh.cc2
2 files changed, 2 insertions, 2 deletions
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());