Fix crash when disabling SoftBody3D while using Jolt Physics

mihe · mihe · commit 50e24e24ed4f · 2025-06-27T12:52:47.000+02:00
diff --git a/modules/jolt_physics/objects/jolt_soft_body_3d.cpp b/modules/jolt_physics/objects/jolt_soft_body_3d.cpp
@@ -74,7 +74,8 @@ JPH::ObjectLayer JoltSoftBody3D::_get_object_layer() const {
 void JoltSoftBody3D::_space_changing() {
 	JoltObject3D::_space_changing();
 
-	if (in_space()) {
+	// Note that we should not use `in_space()` as the condition here, since we could have cleared the mesh at this point.
+	if (jolt_body != nullptr) {
 		jolt_settings = new JPH::SoftBodyCreationSettings(jolt_body->GetSoftBodyCreationSettings());
 		jolt_settings->mSettings = nullptr;
 	}

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,8 @@ JPH::ObjectLayer JoltSoftBody3D::_get_object_layer() const {`
`74`	`74`	`void JoltSoftBody3D::_space_changing() {`
`75`	`75`	`JoltObject3D::_space_changing();`
`76`	`76`
`77`		`- if (in_space()) {`
	`77`	+ // Note that we should not use `in_space()` as the condition here, since we could have cleared the mesh at this point.
	`78`	`+ if (jolt_body != nullptr) {`
`78`	`79`	`jolt_settings = new JPH::SoftBodyCreationSettings(jolt_body->GetSoftBodyCreationSettings());`
`79`	`80`	`jolt_settings->mSettings = nullptr;`
`80`	`81`	`}`