diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-02 09:49:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-02 09:49:35 +0100 |
| commit | 122a27523da45d68b98e53dc5d6ca2b95f908ad1 (patch) | |
| tree | 861d42cbe83625eb3771c6d43c73599b2c3a0a71 /core/variant/variant.cpp | |
| parent | b24c24f64b4ac9c30dc5a9e097163cbc64939645 (diff) | |
| parent | f55445079ad8e84cd337063b8cbac6eaf06d5592 (diff) | |
Merge pull request #45030 from aaronfranke/color-str-construct
Replace ColorN and from HTML with a string constructor
Diffstat (limited to 'core/variant/variant.cpp')
| -rw-r--r-- | core/variant/variant.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/variant/variant.cpp b/core/variant/variant.cpp index 7824776fdb..015cee09a7 100644 --- a/core/variant/variant.cpp +++ b/core/variant/variant.cpp @@ -2023,7 +2023,7 @@ Variant::operator Color() const { if (type == COLOR) { return *reinterpret_cast<const Color *>(_data._mem); } else if (type == STRING) { - return Color::html(operator String()); + return Color(operator String()); } else if (type == INT) { return Color::hex(operator int()); } else { |