diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/color.cpp | 2 | ||||
| -rw-r--r-- | core/object.h | 1 | ||||
| -rw-r--r-- | core/ustring.cpp | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/core/color.cpp b/core/color.cpp index b708f15d6..a0568d26e 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 = _to_hex(a) + txt; return txt; } diff --git a/core/object.h b/core/object.h index 75800acaa..8306b5a35 100644 --- a/core/object.h +++ b/core/object.h @@ -86,6 +86,7 @@ enum PropertyHint { PROPERTY_HINT_PROPERTY_OF_SCRIPT, ///< a property of a script & base PROPERTY_HINT_OBJECT_TOO_BIG, ///< object is too big to send PROPERTY_HINT_MAX, + // When updating PropertyHint, also sync the hardcoded list in VisualScriptEditorVariableEdit }; enum PropertyUsageFlags { diff --git a/core/ustring.cpp b/core/ustring.cpp index 1be828c44..1fce4f182 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -686,6 +686,9 @@ Vector<String> String::split_spaces() const { int from = 0; int i = 0; int len = length(); + if (len == 0) + return ret; + bool inside = false; while (true) { |