From 03236b70c197755ccf29f00e0be4a8b39aa34987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Wed, 28 Jul 2021 13:12:03 +0200 Subject: [PATCH] Physics3D/RigidBody3D: Fix movement of already moved instance --- src/Nazara/Physics3D/RigidBody3D.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Nazara/Physics3D/RigidBody3D.cpp b/src/Nazara/Physics3D/RigidBody3D.cpp index b388aa8a5..7a89c4867 100644 --- a/src/Nazara/Physics3D/RigidBody3D.cpp +++ b/src/Nazara/Physics3D/RigidBody3D.cpp @@ -70,7 +70,8 @@ namespace Nz m_gravityFactor(object.m_gravityFactor), m_mass(object.m_mass) { - NewtonBodySetUserData(m_body, this); + if (m_body) + NewtonBodySetUserData(m_body, this); } RigidBody3D::~RigidBody3D() @@ -411,7 +412,9 @@ namespace Nz m_torqueAccumulator = std::move(object.m_torqueAccumulator); m_world = object.m_world; - NewtonBodySetUserData(m_body, this); + if (m_body) + NewtonBodySetUserData(m_body, this); + return *this; }