summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-01-09 23:39:45 +0100
committerGitHub <noreply@github.com>2018-01-09 23:39:45 +0100
commit2ac27608a6892d8d7e28d8afbbcc98505eb3e4b3 (patch)
treebde80d9ec68d11b3cc04fea18ba18fb16c9436cb
parentcc487f8ce9ba1b308f048905a1e5253abd740310 (diff)
parent19915d674c44ec3a554e688d967fc6feedcb5708 (diff)
Merge pull request #15540 from robfram/fix_color_to_html
Fix bad color to HTML conversion. Alpha channel was added before RGB.
-rw-r--r--core/color.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/color.cpp b/core/color.cpp
index 7278b5c4ee..36afe5e004 100644
--- a/core/color.cpp
+++ b/core/color.cpp
@@ -396,7 +396,7 @@ String Color::to_html(bool p_alpha) const {
txt += _to_hex(g);
txt += _to_hex(b);
if (p_alpha)
- txt = _to_hex(a) + txt;
+ txt += _to_hex(a);
return txt;
}