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

# Conflicts:
#	Source/Engine/Physics/Actors/Cloth.cpp

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;
 }
 

Source/ThirdParty/NvCloth/NvCloth.Build.cs

@@ -37,6 +37,7 @@ public class NvCloth : DepsModule
         case TargetPlatform.Android:
         case TargetPlatform.Mac:
         case TargetPlatform.iOS:
+        case TargetPlatform.Linux:
             libName = "NvCloth";
             break;
         case TargetPlatform.Switch:

Source/Tools/Flax.Build/Deps/Dependencies/NvCloth.cs

@@ -89,6 +89,9 @@ namespace Flax.Deps.Dependencies
                 case TargetPlatform.iOS:
                     Build(options, platform, TargetArchitecture.ARM64);
                     break;
+                case TargetPlatform.Linux:
+                    Build(options, platform, TargetArchitecture.x64);
+                    break;
                 }
             }
 
@@ -157,6 +160,11 @@ namespace Flax.Deps.Dependencies
                 cmakeName = "ios";
                 binariesPrefix = "lib";
                 break;
+            case TargetPlatform.Linux:
+                cmakeArgs += " -DTARGET_BUILD_PLATFORM=linux";
+                cmakeName = "linux";
+                binariesPrefix = "lib";
+                break;
             default: throw new InvalidPlatformException(platform);
             }
             var cmakeFolder = Path.Combine(nvCloth, "compiler", "cmake", cmakeName);