godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-05 06:11:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15458 from volzhs/fix-editor-settings-1

Browse Source 
Fix editor setting value is back to default
This commit is contained in:
Rémi Verschelde
2018-01-08 10:55:09 +01:00
committed by GitHub
parent e7400a0f4e 93a6be0320
commit 8f814e44bc
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) {