diff options
| author | George Marques <george@gmarqu.es> | 2017-07-29 13:55:29 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-29 13:55:29 -0300 |
| commit | 8bd792d7bb14aad05b55ee4f57bd6b65a0b434a3 (patch) | |
| tree | 7c1929529888cbb29c2b1a3dcd4e8c6c76aadd59 | |
| parent | 6cd2bcad2a5eebed7b639978951eed271020a129 (diff) | |
| parent | 93f017773758c3ed74dd7ec3346e82477f85e32b (diff) | |
Merge pull request #9966 from Noshyaar/pr-fixcurve
PropertyEditor: Fix easing_curve blocking popup input
| -rw-r--r-- | editor/property_editor.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index 71afa8ac79..febaa0e040 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -1957,11 +1957,6 @@ CustomPropertyEditor::CustomPropertyEditor() { add_child(error); //error->get_cancel()->hide(); - type_button = memnew(MenuButton); - add_child(type_button); - type_button->hide(); - type_button->get_popup()->connect("id_pressed", this, "_type_create_selected"); - scene_tree = memnew(SceneTreeDialog); add_child(scene_tree); scene_tree->connect("selected", this, "_node_path_selected"); @@ -1979,6 +1974,11 @@ CustomPropertyEditor::CustomPropertyEditor() { //easing_draw->emit_signal(SceneStringNames::get_singleton()->input_event,InputEvent()); easing_draw->set_default_cursor_shape(Control::CURSOR_MOVE); + type_button = memnew(MenuButton); + add_child(type_button); + type_button->hide(); + type_button->get_popup()->connect("id_pressed", this, "_type_create_selected"); + menu = memnew(PopupMenu); add_child(menu); menu->connect("id_pressed", this, "_menu_option"); |