From 759d8b5317dcdaead5fd560506b4b8a0548aa1ff Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Mon, 9 Apr 2018 21:28:29 -0700 Subject: [PATCH] nullptr -> 0 (no C++11) --- src/BulletCollision/CollisionShapes/btMiniSDF.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BulletCollision/CollisionShapes/btMiniSDF.cpp b/src/BulletCollision/CollisionShapes/btMiniSDF.cpp index be82235ff..e2d8b9147 100644 --- a/src/BulletCollision/CollisionShapes/btMiniSDF.cpp +++ b/src/BulletCollision/CollisionShapes/btMiniSDF.cpp @@ -477,9 +477,9 @@ bool btMiniSDF::interpolate(unsigned int field_id, double& dist, btVector3 const btCell32 const& cell = m_cells[field_id][i]; if (!gradient) { - //auto phi = m_coefficients[field_id][i].dot(shape_function_(xi, nullptr)); + //auto phi = m_coefficients[field_id][i].dot(shape_function_(xi, 0)); double phi = 0.0; - btShapeMatrix N = shape_function_(xi, nullptr); + btShapeMatrix N = shape_function_(xi, 0; for (unsigned int j = 0u; j < 32u; ++j) { unsigned int v = cell.m_cells[j];