diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-04-24 13:43:56 +0100 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-04-27 11:57:33 +0100 |
| commit | 6c1758d35e20655f46ba3696671068f4862c8878 (patch) | |
| tree | d4b4fc2ae8f5a4512de4eb015667b024b6a8e6b9 /src/render/renderstates/qblendequationarguments.h | |
| parent | b7967a8abcdac438a1f31800b71e219e3c52c24a (diff) | |
| parent | 37735f11f9437b916b194cfd48c452c7c70682f8 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Id669d5c1aab29965eac0dabd1cb497e908dac23e
Diffstat (limited to 'src/render/renderstates/qblendequationarguments.h')
| -rw-r--r-- | src/render/renderstates/qblendequationarguments.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/renderstates/qblendequationarguments.h b/src/render/renderstates/qblendequationarguments.h index 878534816..b8b0d5ff1 100644 --- a/src/render/renderstates/qblendequationarguments.h +++ b/src/render/renderstates/qblendequationarguments.h @@ -66,8 +66,8 @@ public: One = 1, SourceColor = 0x0300, SourceAlpha = 0x0302, - Source1Alpha, - Source1Color, + Source1Alpha, // ### Qt 6: Fix -> has same value as OneMinusSourceAlpha + Source1Color, // ### Qt 6: Fix -> has same value as DestinationAlpha DestinationColor = 0x0306, DestinationAlpha = 0x0304, SourceAlphaSaturate = 0x0308, |