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

Merge pull request #29941 from qarmin/redundant_code_and_others

Browse source 
Remove redundant code, possible NULL pointers and others
This commit is contained in:
Rémi Verschelde 2019-06-27 01:05:18 +02:00 • committed by GitHub
commit eaaff9da31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
175 changed files with 467 additions and 674 deletions
Download patch file Download diff file Expand all files Collapse all files

9
editor/editor_settings.cpp
View file

@ -107,7 +107,7 @@ bool EditorSettings::_set_only(const StringName &p_name, const Variant &p_value)
}
if (save_changed_setting) {
if (props[p_name].save != true) {
if (!props[p_name].save) {
props[p_name].save = true;
changed = true;
}
@ -692,7 +692,7 @@ bool EditorSettings::_save_text_editor_theme(String p_file) {
keys.sort();
for (const List<String>::Element *E = keys.front(); E; E = E->next()) {
String key = E->get();
const String &key = E->get();
if (key.begins_with("text_editor/highlighting/") && key.find("color") >= 0) {
cf->set_value(theme_section, key.replace("text_editor/highlighting/", ""), ((Color)props[key].variant).to_html());
}
@ -700,10 +700,7 @@ bool EditorSettings::_save_text_editor_theme(String p_file) {
Error err = cf->save(p_file);
if (err == OK) {
return true;
}
return false;
return err == OK;
}
bool EditorSettings::_is_default_text_editor_theme(String p_theme_name) {