From 1a254afd4f610e80dfc8e21ec158d9a726263e35 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 1 Nov 2023 10:29:44 +0100
Subject: [PATCH] Fix crash when creating empty cloth

---
 Source/Engine/Physics/Actors/Cloth.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Source/Engine/Physics/Actors/Cloth.cpp b/Source/Engine/Physics/Actors/Cloth.cpp
index 7c180d98d..b2db80b0b 100644
--- a/Source/Engine/Physics/Actors/Cloth.cpp
+++ b/Source/Engine/Physics/Actors/Cloth.cpp
@@ -95,14 +95,17 @@ void Cloth::SetFabric(const FabricSettings& value)
 void Cloth::Rebuild()
 {
 #if WITH_CLOTH
-    // Remove old
-    if (IsDuringPlay())
-        PhysicsBackend::RemoveCloth(GetPhysicsScene()->GetPhysicsScene(), _cloth);
-    DestroyCloth();
+    if (_cloth)
+    {
+        // Remove old
+        if (IsDuringPlay())
+            PhysicsBackend::RemoveCloth(GetPhysicsScene()->GetPhysicsScene(), _cloth);
+        DestroyCloth();
+    }
 
     // Create new
     CreateCloth();
-    if (IsDuringPlay())
+    if (IsDuringPlay() && _cloth)
         PhysicsBackend::AddCloth(GetPhysicsScene()->GetPhysicsScene(), _cloth);
 #endif
 }