godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34706 from KoBeWi/grindput 

Don't handle Gridmap input when have no effect
This commit is contained in:
Rémi Verschelde 2020-01-01 11:35:39 +01:00 committed by GitHub
parent a4936e500f bf143c05d2
commit 5aa96b72c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/gridmap/grid_map_editor_plugin.cpp
View File

@ -664,14 +664,15 @@ bool GridMapEditor::forward_spatial_input_event(Camera *p_camera, const Ref<Inpu
input_action = INPUT_NONE;
} else if (mb->get_button_index() == BUTTON_LEFT) {
bool can_edit = (node && node->get_mesh_library().is_valid());
if (input_action == INPUT_PASTE) {
_do_paste();
input_action = INPUT_NONE;
_update_paste_indicator();
} else if (mb->get_shift()) {
} else if (mb->get_shift() && can_edit) {
input_action = INPUT_SELECT;
last_selection = selection;
} else if (mb->get_command()) {
} else if (mb->get_command() && can_edit) {
input_action = INPUT_PICK;
} else {
input_action = INPUT_PAINT;