summaryrefslogtreecommitdiffstats
path: root/editor/editor_properties.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'editor/editor_properties.cpp')
-rw-r--r--editor/editor_properties.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp
index 19a4165041..2e46068e07 100644
--- a/editor/editor_properties.cpp
+++ b/editor/editor_properties.cpp
@@ -81,7 +81,6 @@ void EditorPropertyText::_text_submitted(const String &p_string) {
}
if (text->has_focus()) {
- text->release_focus();
_text_changed(p_string);
}
}
@@ -2703,7 +2702,11 @@ void EditorPropertyNodePath::_update_menu() {
void EditorPropertyNodePath::_menu_option(int p_idx) {
switch (p_idx) {
case ACTION_CLEAR: {
- emit_changed(get_edited_property(), NodePath());
+ if (editing_node) {
+ emit_changed(get_edited_property(), Variant());
+ } else {
+ emit_changed(get_edited_property(), NodePath());
+ }
update_property();
} break;
@@ -3771,7 +3774,7 @@ EditorProperty *EditorInspectorDefaultPlugin::get_editor_for_property(Object *p_
return editor;
} else {
EditorPropertyDictionary *editor = memnew(EditorPropertyDictionary);
- editor->setup(p_hint);
+ editor->setup(p_hint, p_hint_text);
return editor;
}
} break;