diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-04-06 18:43:15 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-04-06 18:43:15 +0200 |
| commit | d5191a610b9beb833cd9fc0e6607cfa95365be64 (patch) | |
| tree | c8f1ea5133801c0b99c82603ac264f36c17fe2ce /tools/editor | |
| parent | 44446cf58bcbcfac42244f731e088edb4141145d (diff) | |
| parent | b7d79c93f47c6d5e6d9e4f50c546cd521866703a (diff) | |
Merge pull request #4248 from bojidar-bg/fix-launchmedia-for-bones
Fix Ctrl+LaunchMedia showing up as a shortcut for "Make Bones"
Diffstat (limited to 'tools/editor')
| -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 b5059e5299..7a3f563734 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); |