diff options
author | Juan Linietsky <reduzio@gmail.com> | 2018-08-10 12:57:20 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-10 12:57:20 -0300 |
commit | c76f444c4ec6971d5797568787b346ffde411c4a (patch) | |
tree | 125ee147aa053cc4299a92772a8a7a313fea8f5d /editor/doc | |
parent | b4006f68b35d4270a0f3555d9baa2d8622bfc1e5 (diff) | |
parent | ba974b8d1e245818d819791bd628e70ec3b92de3 (diff) |
Merge pull request #14704 from poke1024/colorconstants
Allow some non-integer built-in constants in gdscript
Diffstat (limited to 'editor/doc')
-rw-r--r-- | editor/doc/doc_data.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp index 2803762973..91a29f5717 100644 --- a/editor/doc/doc_data.cpp +++ b/editor/doc/doc_data.cpp @@ -535,13 +535,14 @@ void DocData::generate(bool p_basic_types) { } List<StringName> constants; - Variant::get_numeric_constants_for_type(Variant::Type(i), &constants); + Variant::get_constants_for_type(Variant::Type(i), &constants); for (List<StringName>::Element *E = constants.front(); E; E = E->next()) { ConstantDoc constant; constant.name = E->get(); - constant.value = itos(Variant::get_numeric_constant_value(Variant::Type(i), E->get())); + Variant value = Variant::get_constant_value(Variant::Type(i), E->get()); + constant.value = value.get_type() == Variant::INT ? itos(value) : value.get_construct_string(); c.constants.push_back(constant); } } |