Merge remote-tracking branch 'origin/1.7' into 1.7

# Conflicts: # Source/Engine/Physics/Actors/Cloth.cpp
2023-07-17 18:27:31 +02:00
parent 3d5d7ad968 5012d4432e
commit 07ef07e979
4 changed files with 14 additions and 1 deletions
--- a/Source/Engine/Physics/Actors/Cloth.cpp
+++ b/Source/Engine/Physics/Actors/Cloth.cpp
@@ -733,6 +733,7 @@ void Cloth::CalculateInvMasses(Array<float>& invMasses)

 bool Cloth::OnPreUpdate()
 {
+#if WITH_CLOTH
    if (!IsActiveInHierarchy())
        return true;
    if (!_simulationSettings.UpdateWhenOffscreen && _simulationSettings.CullDistance > 0)
@@ -834,7 +835,7 @@ bool Cloth::OnPreUpdate()

        PhysicsBackend::UnlockClothParticles(_cloth);
    }
-
+#endif
    return false;
 }