From 8eb12806b8d60940740aefc8e8debe1bf20712b5 Mon Sep 17 00:00:00 2001
From: Daniel J. Ramirez
Date: Thu, 16 Nov 2017 16:58:48 -0600
Subject: Updated some icons.
---
editor/icons/icon_texture_button.svg | 4 +---
editor/icons/icon_texture_rect.svg | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/editor/icons/icon_texture_button.svg b/editor/icons/icon_texture_button.svg
index 17f87ab86..19f5e8d5c 100644
--- a/editor/icons/icon_texture_button.svg
+++ b/editor/icons/icon_texture_button.svg
@@ -1,7 +1,5 @@
diff --git a/editor/icons/icon_texture_rect.svg b/editor/icons/icon_texture_rect.svg
index 86d24ac22..2dbbe7f24 100644
--- a/editor/icons/icon_texture_rect.svg
+++ b/editor/icons/icon_texture_rect.svg
@@ -1,6 +1,5 @@
--
cgit v1.2.3-70-g09d2
From 7154baa01018bfabcf9418d8e0cc7788700f9146 Mon Sep 17 00:00:00 2001
From: Daniel J. Ramirez
Date: Fri, 17 Nov 2017 14:22:27 -0600
Subject: Avoid spamming the console for editor settings initial sets.
---
editor/editor_settings.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp
index bf4ef3ae3..165c0691f 100644
--- a/editor/editor_settings.cpp
+++ b/editor/editor_settings.cpp
@@ -922,7 +922,8 @@ void EditorSettings::raise_order(const String &p_setting) {
void EditorSettings::set_initial_value(const StringName &p_setting, const Variant &p_value) {
- ERR_FAIL_COND(!props.has(p_setting));
+ if (!props.has(p_setting))
+ return;
props[p_setting].initial = p_value;
props[p_setting].initial_set = true;
}
--
cgit v1.2.3-70-g09d2