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:
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user