diff options
| author | Poommetee Ketson | 2018-03-02 12:49:09 +0700 |
|---|---|---|
| committer | Hein-Pieter van Braam | 2018-04-14 20:10:02 +0200 |
| commit | 3b200c55b61fdd179f76044c6db4a8d6be79ba18 (patch) | |
| tree | 3e75002a913a674b941204c768fb72ee4ffea217 /modules | |
| parent | 13e9b605cf7897e463870a9ee46568684605882e (diff) | |
| download | godot-3b200c55b61fdd179f76044c6db4a8d6be79ba18.tar.gz godot-3b200c55b61fdd179f76044c6db4a8d6be79ba18.tar.zst godot-3b200c55b61fdd179f76044c6db4a8d6be79ba18.zip | |
GridMap: fix next/prev plane text, fix meta not found
(cherry picked from commit 89323f94bb1b14f10beeee9c5b3268ce85e28114)
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gridmap/grid_map_editor_plugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gridmap/grid_map_editor_plugin.cpp b/modules/gridmap/grid_map_editor_plugin.cpp index a1951e088..869492232 100644 --- a/modules/gridmap/grid_map_editor_plugin.cpp +++ b/modules/gridmap/grid_map_editor_plugin.cpp @@ -101,8 +101,8 @@ void GridMapEditor::_menu_option(int p_option) { } if (edit_axis != new_axis) { - int item1 = options->get_popup()->get_item_id(MENU_OPTION_NEXT_LEVEL); - int item2 = options->get_popup()->get_item_id(MENU_OPTION_PREV_LEVEL); + int item1 = options->get_popup()->get_item_index(MENU_OPTION_NEXT_LEVEL); + int item2 = options->get_popup()->get_item_index(MENU_OPTION_PREV_LEVEL); if (edit_axis == Vector3::AXIS_Y) { options->get_popup()->set_item_text(item1, TTR("Next Plane")); options->get_popup()->set_item_text(item2, TTR("Previous Plane")); @@ -779,7 +779,7 @@ void GridMapEditor::edit(GridMap *p_gridmap) { set_process(true); - Vector3 edited_floor = p_gridmap->get_meta("_editor_floor_"); + Vector3 edited_floor = p_gridmap->has_meta("_editor_floor_") ? p_gridmap->get_meta("_editor_floor_") : Variant(); clip_mode = p_gridmap->has_meta("_editor_clip_") ? ClipMode(p_gridmap->get_meta("_editor_clip_").operator int()) : CLIP_DISABLED; for (int i = 0; i < 3; i++) { |