Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Fix editor setting value is back to default

Browse source 
Fix #15449
This commit is contained in:
volzhs 2018-01-08 04:39:38 +09:00
parent 37ca542d2b
commit 93a6be0320
3 changed files with 67 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

8
editor/editor_settings.cpp
View file

@ -992,13 +992,17 @@ void EditorSettings::raise_order(const String &p_setting) {
props[p_setting].order = ++last_order;
}
void EditorSettings::set_initial_value(const StringName &p_setting, const Variant &p_value) {
void EditorSettings::set_initial_value(const StringName &p_setting, const Variant &p_value, bool update_current) {
_THREAD_SAFE_METHOD_
if (!props.has(p_setting))
return;
_initial_set(p_setting, p_value);
props[p_setting].initial = p_value;
props[p_setting].has_default_value = true;
if (update_current) {
set(p_setting, p_value);
}
}
Variant _EDITOR_DEF(const String &p_setting, const Variant &p_default) {