Added Node::GetComponents() to the script API.

Added qualifier mode QUAL_ANY for the menu accelerators, which accepts any accelerator combination, including none pressed.
Removed setting "Select components instead of nodes" from the editor. Rather components are selected by default, and nodes are selected by holding Shift or Ctrl while clicking.

Bin/Data/Scripts/Editor.as

@@ -88,7 +88,6 @@ void LoadConfig()
         rotateSnap = objectElem.GetBool("rotatesnap");
         scaleSnap = objectElem.GetBool("scalesnap");
         useLocalIDs = objectElem.GetBool("uselocalids");
-        pickComponents = objectElem.GetBool("pickcomponents");
         pickMode = objectElem.GetInt("pickmode");
     }
 
@@ -130,7 +129,6 @@ void SaveConfig()
     objectElem.SetBool("rotatesnap", rotateSnap);
     objectElem.SetBool("scalesnap", scaleSnap);
     objectElem.SetBool("uselocalids", useLocalIDs);
-    objectElem.SetBool("pickcomponents", pickComponents);
     objectElem.SetInt("pickmode", pickMode);
 
     renderingElem.SetInt("texturequality", renderer.textureQuality);

Bin/Data/Scripts/Editor/EditorCamera.as

@@ -124,9 +124,6 @@ void UpdateEditorSettingsDialog()
     CheckBox@ localIDToggle = settingsDialog.GetChild("LocalIDToggle", true);
     localIDToggle.checked = useLocalIDs;
 
-    CheckBox@ pickComponentsToggle = settingsDialog.GetChild("PickComponentsToggle", true);
-    pickComponentsToggle.checked = pickComponents;
-
     DropDownList@ pickModeEdit = settingsDialog.GetChild("PickModeEdit", true);
     pickModeEdit.selection = pickMode;
 
@@ -179,7 +176,6 @@ void UpdateEditorSettingsDialog()
         SubscribeToEvent(rotateSnapToggle, "Toggled", "EditRotateSnap");
         SubscribeToEvent(scaleSnapToggle, "Toggled", "EditScaleSnap");
         SubscribeToEvent(localIDToggle, "Toggled", "EditUseLocalIDs");
-        SubscribeToEvent(pickComponentsToggle, "Toggled", "EditPickComponents");
         SubscribeToEvent(pickModeEdit, "ItemSelected", "EditPickMode");
         SubscribeToEvent(textureQualityEdit, "ItemSelected", "EditTextureQuality");
         SubscribeToEvent(materialQualityEdit, "ItemSelected", "EditMaterialQuality");
@@ -296,12 +292,6 @@ void EditUseLocalIDs(StringHash eventType, VariantMap& eventData)
     useLocalIDs = edit.checked;
 }
 
-void EditPickComponents(StringHash eventType, VariantMap& eventData)
-{
-    CheckBox@ edit = eventData["Element"].GetUIElement();
-    pickComponents = edit.checked;
-}
-
 void EditPickMode(StringHash eventType, VariantMap& eventData)
 {
     DropDownList@ edit = eventData["Element"].GetUIElement();

Bin/Data/Scripts/Editor/EditorScene.as

@@ -357,10 +357,10 @@ void SceneRaycast(bool mouseClick)
     
     if (selected !is null && mouseClick && input.mouseButtonPress[MOUSEB_LEFT])
     {
-        if (pickComponents)
-            SelectComponent(selected);
-        else
+        if (input.qualifierDown[QUAL_SHIFT] || input.qualifierDown[QUAL_CTRL])
             SelectNode(selected.node);
+        else
+            SelectComponent(selected);
     }
 }
 

Bin/Data/Scripts/Editor/EditorSceneWindow.as

@@ -9,7 +9,6 @@ Window@ sceneWindow;
 XMLFile copyBuffer;
 bool copyBufferLocal = false;
 bool copyBufferExpanded = false;
-bool pickComponents = false;
 
 void CreateSceneWindow()
 {

Bin/Data/Scripts/Editor/EditorUI.as

@@ -76,7 +76,7 @@ void CreateMenuBar()
         editPopup.AddChild(CreateMenuItem("Cut", 'X', QUAL_CTRL));
         editPopup.AddChild(CreateMenuItem("Copy", 'C', QUAL_CTRL));
         editPopup.AddChild(CreateMenuItem("Paste", 'V', QUAL_CTRL));
-        editPopup.AddChild(CreateMenuItem("Delete", KEY_DELETE, 0));
+        editPopup.AddChild(CreateMenuItem("Delete", KEY_DELETE, QUAL_ANY));
         editPopup.AddChild(CreateMenuDivider());
         editPopup.AddChild(CreateMenuItem("Toggle update", 'P', QUAL_CTRL));
         uiMenuBar.AddChild(editMenu);

Bin/Data/UI/EditorSettingsDialog.xml

@@ -143,16 +143,6 @@
             <popupitem name="PickCollisionShapes" />
         </element>
     </element>
-    <element>
-        <fixedheight value="17" />
-        <layout mode="horizontal" spacing="8" />
-        <element type="CheckBox" name="PickComponentsToggle">
-            <fixedsize value="16 16" />
-        </element>
-        <element type="Text">
-            <text value="Select components instead of nodes" />
-        </element>
-    </element>
     <element>
         <fixedheight value="17" />
         <layout mode="horizontal" spacing="8" />