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

Merge pull request #18119 from sheepandshepherd/nativescript_property_list 

Fix NativeScript property list order
This commit is contained in:
Rémi Verschelde 2018-04-19 21:37:46 +02:00 committed by GitHub
parent 0dd526e062 bc110b3771
commit df79cc86a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/gdnative/nativescript/nativescript.cpp
View File

@ -357,14 +357,13 @@ void NativeScript::get_script_property_list(List<PropertyInfo> *p_list) const {
NativeScriptDesc *script_data = get_script_desc();
Set<StringName> existing_properties;
List<PropertyInfo>::Element *original_back = p_list->back();
while (script_data) {
List<PropertyInfo>::Element *insert_position = p_list->front();
bool insert_before = true;
List<PropertyInfo>::Element *insert_position = original_back;
for (OrderedHashMap<StringName, NativeScriptDesc::Property>::Element E = script_data->properties.front(); E; E = E.next()) {
if (!existing_properties.has(E.key())) {
insert_position = insert_before ? p_list->insert_before(insert_position, E.get().info) : p_list->insert_after(insert_position, E.get().info);
insert_before = false;
insert_position = p_list->insert_after(insert_position, E.get().info);
existing_properties.insert(E.key());
}
}