diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2018-04-19 21:37:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-19 21:37:46 +0200 |
commit | df79cc86a56c2d18b421ceacda3dee6669e6cbd9 (patch) | |
tree | 0ef6714e6dbe099fad28390aa96a6fab16df05c5 | |
parent | 0dd526e06273ee27696c9adf06aff4fb5384fb78 (diff) | |
parent | bc110b37713dc41ec6b364f3d31eaf2b369e06bb (diff) |
Merge pull request #18119 from sheepandshepherd/nativescript_property_list
Fix NativeScript property list order
-rw-r--r-- | modules/gdnative/nativescript/nativescript.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/modules/gdnative/nativescript/nativescript.cpp b/modules/gdnative/nativescript/nativescript.cpp index d255148e0f..cf8977f3ea 100644 --- a/modules/gdnative/nativescript/nativescript.cpp +++ b/modules/gdnative/nativescript/nativescript.cpp @@ -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()); } } |