GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wojciech Figat
2022-06-15 10:37:24 +02:00
parent 62a39911dd 37295e1ec7
commit cf1f8487e7
390 changed files with 1081 additions and 2517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Engine/Graphics/Enums.h
View File

@@ -362,7 +362,7 @@ API_ENUM() enum class CullMode : byte
/// </summary>
API_STRUCT() struct BlendingMode
{
DECLARE_SCRIPTING_TYPE_MINIMAL(BlendingMode);
DECLARE_SCRIPTING_TYPE_MINIMAL(BlendingMode);
/// <summary>
/// Blending mode.
@@ -454,7 +454,6 @@ DECLARE_SCRIPTING_TYPE_MINIMAL(BlendingMode);
};
public:
/// <summary>
/// Render target blending mode descriptor.
/// </summary>
@@ -501,11 +500,9 @@ public:
API_FIELD() ColorWrite RenderTargetWriteMask;
public:
bool operator==(const BlendingMode& other) const;
public:
/// <summary>
/// Gets the opaque rendering (default). No blending is being performed.
/// </summary>