Merge remote-tracking branch 'origin/master' into 1.11

# Conflicts:
#	Content/Editor/DebugMaterials/DDGIDebugProbes.flax
#	Source/Engine/Scripting/Scripting.cpp
This commit is contained in:
Wojtek Figat
2025-08-25 23:48:08 +02:00
121 changed files with 2016 additions and 1305 deletions

View File

@@ -25,7 +25,7 @@ namespace FlaxEngine.GUI
/// Initializes a new instance of the <see cref="MaterialBrush"/> struct.
/// </summary>
/// <param name="material">The material.</param>
public MaterialBrush(Material material)
public MaterialBrush(MaterialBase material)
{
Material = material;
}