asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fixed runtime EDITOR_DEFs being dropped.

Browse source
This commit is contained in:
Daniel J. Ramirez 2017-11-20 11:34:13 -06:00
parent 82ad05a20e
commit e07b9a8920
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
editor/editor_settings.cpp
View file

@ -135,7 +135,7 @@ bool EditorSettings::_get(const StringName &p_name, Variant &r_ret) const {
void EditorSettings::_initial_set(const StringName &p_name, const Variant &p_value) { void EditorSettings::_initial_set(const StringName &p_name, const Variant &p_value) {
set(p_name, p_value); set(p_name, p_value);
props[p_name].initial = p_value; props[p_name].initial = p_value;
props[p_name].initial_set = true; props[p_name].has_default_value = true;
} }
struct _EVCSort { struct _EVCSort {
@ -221,7 +221,7 @@ bool EditorSettings::has_default_value(const String &p_setting) const {
if (!props.has(p_setting)) if (!props.has(p_setting))
return false; return false;
return props[p_setting].initial_set; return props[p_setting].has_default_value;
} }
void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
@ -967,7 +967,7 @@ void EditorSettings::set_initial_value(const StringName &p_setting, const Varian
if (!props.has(p_setting)) if (!props.has(p_setting))
return; return;
props[p_setting].initial = p_value; props[p_setting].initial = p_value;
props[p_setting].initial_set = true; props[p_setting].has_default_value = true;
} }
Variant _EDITOR_DEF(const String &p_setting, const Variant &p_default) { Variant _EDITOR_DEF(const String &p_setting, const Variant &p_default) {
@ -975,10 +975,10 @@ Variant _EDITOR_DEF(const String &p_setting, const Variant &p_default) {
Variant ret = p_default; Variant ret = p_default;
if (EditorSettings::get_singleton()->has_setting(p_setting)) if (EditorSettings::get_singleton()->has_setting(p_setting))
ret = EditorSettings::get_singleton()->get(p_setting); ret = EditorSettings::get_singleton()->get(p_setting);
if (!EditorSettings::get_singleton()->has_default_value(p_setting)) { else
EditorSettings::get_singleton()->set_initial_value(p_setting, p_default);
EditorSettings::get_singleton()->set(p_setting, p_default); EditorSettings::get_singleton()->set(p_setting, p_default);
} if (!EditorSettings::get_singleton()->has_default_value(p_setting))
EditorSettings::get_singleton()->set_initial_value(p_setting, p_default);
return ret; return ret;
} }

4
editor/editor_settings.h
View file

@ -66,13 +66,13 @@ private:
int order; int order;
Variant variant; Variant variant;
Variant initial; Variant initial;
bool initial_set; bool has_default_value;
bool hide_from_editor; bool hide_from_editor;
bool save; bool save;
VariantContainer() { VariantContainer() {
order = 0; order = 0;
hide_from_editor = false; hide_from_editor = false;
initial_set = false; has_default_value = false;
save = false; save = false;
} }
VariantContainer(const Variant &p_variant, int p_order) { VariantContainer(const Variant &p_variant, int p_order) {