diff options
Diffstat (limited to 'editor/property_editor.cpp')
| -rw-r--r-- | editor/property_editor.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index 14e3b7cfb7..b187a9ae9d 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -70,7 +70,7 @@ void EditorResourceConversionPlugin::_bind_methods() { mi.name = "_handles"; mi.return_val = PropertyInfo(Variant::BOOL, ""); - BIND_VMETHOD(MethodInfo(Variant::BOOL, "_converts_to")); + BIND_VMETHOD(MethodInfo(Variant::STRING, "_converts_to")); } String EditorResourceConversionPlugin::converts_to() const { @@ -1939,6 +1939,7 @@ CustomPropertyEditor::CustomPropertyEditor() { type_button->get_popup()->connect("id_pressed", this, "_type_create_selected"); menu = memnew(PopupMenu); + menu->set_pass_on_modal_close_click(false); add_child(menu); menu->connect("id_pressed", this, "_menu_option"); @@ -4276,6 +4277,7 @@ PropertyEditor::PropertyEditor() { set_physics_process(true); custom_editor = memnew(CustomPropertyEditor); + custom_editor->set_pass_on_modal_close_click(false); add_child(custom_editor); tree->connect("custom_popup_edited", this, "_custom_editor_request"); |