diff options
| author | Bojidar Marinov | 2016-04-06 15:37:03 +0300 |
|---|---|---|
| committer | Rémi Verschelde | 2016-04-27 08:38:28 +0200 |
| commit | 692878b7f40b6802acc6aa47b0f79589ee81a5b6 (patch) | |
| tree | 700a077808359bab945e9c57bdc085ad26f72cda /tools/editor/plugins/canvas_item_editor_plugin.cpp | |
| parent | b7f5418f8d459814bf92013476af4629639d3cc8 (diff) | |
| download | godot-692878b7f40b6802acc6aa47b0f79589ee81a5b6.tar.gz godot-692878b7f40b6802acc6aa47b0f79589ee81a5b6.tar.zst godot-692878b7f40b6802acc6aa47b0f79589ee81a5b6.zip | |
Fix Ctrl+LaunchMedia showing up as a shortcut for "Make Bones"
Close #4044
(cherry picked from commit 4af1839073261d913ef53bb6f81d2a0cb486d39b)
Diffstat (limited to 'tools/editor/plugins/canvas_item_editor_plugin.cpp')
| -rw-r--r-- | tools/editor/plugins/canvas_item_editor_plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp index 6eb26542b..376ddd026 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.cpp +++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp @@ -3345,7 +3345,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) { PopupMenu *p2 = memnew(PopupMenu); p->add_child(p2); p2->set_name("skeleton"); - p2->add_item("Make Bones",SKELETON_MAKE_BONES,KEY_MASK_CMD|KEY_SHIFT|KEY_B); + p2->add_item("Make Bones",SKELETON_MAKE_BONES,KEY_MASK_CMD|KEY_MASK_SHIFT|KEY_B); p2->add_item("Clear Bones",SKELETON_CLEAR_BONES); p2->add_separator(); p2->add_item("Make IK Chain",SKELETON_SET_IK_CHAIN); |