godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #38891 from bruvzg/fix_doc_const_order 

Docs: Fix order of variant constants.
This commit is contained in:
Rémi Verschelde 2020-05-21 14:27:32 +02:00 committed by GitHub
parent 78e223569b 409562558a
commit 9239412027
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/variant_call.cpp
View File

@ -1174,6 +1174,9 @@ struct _VariantCall {
List<StringName> value_ordered; List<StringName> value_ordered;
#endif #endif
Map<StringName, Variant> variant_value; Map<StringName, Variant> variant_value;
#ifdef DEBUG_ENABLED
List<StringName> variant_value_ordered;
#endif
}; };
static ConstantData *constant_data; static ConstantData *constant_data;
@ -1187,6 +1190,9 @@ struct _VariantCall {
static void add_variant_constant(int p_type, StringName p_constant_name, const Variant &p_constant_value) { static void add_variant_constant(int p_type, StringName p_constant_name, const Variant &p_constant_value) {
constant_data[p_type].variant_value[p_constant_name] = p_constant_value; constant_data[p_type].variant_value[p_constant_name] = p_constant_value;
#ifdef DEBUG_ENABLED
constant_data[p_type].variant_value_ordered.push_back(p_constant_name);
#endif
} }
}; };
@ -1652,8 +1658,13 @@ void Variant::get_constants_for_type(Variant::Type p_type, List<StringName> *p_c
#endif #endif
} }
#ifdef DEBUG_ENABLED
for (List<StringName>::Element *E = cd.variant_value_ordered.front(); E; E = E->next()) {
p_constants->push_back(E->get());
#else
for (Map<StringName, Variant>::Element *E = cd.variant_value.front(); E; E = E->next()) { for (Map<StringName, Variant>::Element *E = cd.variant_value.front(); E; E = E->next()) {
p_constants->push_back(E->key()); p_constants->push_back(E->key());
#endif
} }
} }