diff options
Diffstat (limited to 'source/blender/io/alembic/intern/abc_reader_curves.cc')
-rw-r--r-- | source/blender/io/alembic/intern/abc_reader_curves.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/io/alembic/intern/abc_reader_curves.cc b/source/blender/io/alembic/intern/abc_reader_curves.cc index e29b6eda6fc..8d6605d6973 100644 --- a/source/blender/io/alembic/intern/abc_reader_curves.cc +++ b/source/blender/io/alembic/intern/abc_reader_curves.cc @@ -101,7 +101,7 @@ void AbcCurveReader::readObjectData(Main *bmain, const Alembic::Abc::ISampleSele ICompoundProperty user_props = m_curves_schema.getUserProperties(); if (user_props) { const PropertyHeader *header = user_props.getPropertyHeader(ABC_CURVE_RESOLUTION_U_PROPNAME); - if (header != NULL && header->isScalar() && IInt16Property::matches(*header)) { + if (header != nullptr && header->isScalar() && IInt16Property::matches(*header)) { IInt16Property resolu(user_props, header->getName()); cu->resolu = resolu.getValue(sample_sel); } @@ -218,10 +218,10 @@ void AbcCurveReader::read_curve_sample(Curve *cu, nu->pntsu -= overlap; } - const bool do_weights = (weights != NULL) && (weights->size() > 1); + const bool do_weights = (weights != nullptr) && (weights->size() > 1); float weight = 1.0f; - const bool do_radius = (radiuses != NULL) && (radiuses->size() > 1); + const bool do_radius = (radiuses != nullptr) && (radiuses->size() > 1); float radius = (radiuses && radiuses->size() == 1) ? (*radiuses)[0] : 1.0f; nu->type = CU_NURBS; |