From db1137fa0ff489365279ca5c3876adc943e76638 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 12 Jul 2019 21:27:33 +1200 Subject: [PATCH 1/2] Use Ctrl to duplicate entities instead of Alt --- .../create/entitySelectionTool/entitySelectionTool.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/system/create/entitySelectionTool/entitySelectionTool.js b/scripts/system/create/entitySelectionTool/entitySelectionTool.js index 9c993d6d73..462b32275a 100644 --- a/scripts/system/create/entitySelectionTool/entitySelectionTool.js +++ b/scripts/system/create/entitySelectionTool/entitySelectionTool.js @@ -2039,10 +2039,10 @@ SelectionDisplay = (function() { Vec3.print(" pickResult.intersection", pickResult.intersection); } - // Duplicate entities if alt is pressed. This will make a + // Duplicate entities if Ctrl is pressed. This will make a // copy of the selected entities and move the _original_ entities, not // the new ones. - if (event.isAlt || doDuplicate) { + if (event.isControl || doDuplicate) { duplicatedEntityIDs = SelectionManager.duplicateSelection(); var ids = []; for (var i = 0; i < duplicatedEntityIDs.length; ++i) { @@ -2265,10 +2265,10 @@ SelectionDisplay = (function() { addHandleTool(overlay, { mode: mode, onBegin: function(event, pickRay, pickResult) { - // Duplicate entities if alt is pressed. This will make a + // Duplicate entities if Ctrl is pressed. This will make a // copy of the selected entities and move the _original_ entities, not // the new ones. - if (event.isAlt) { + if (event.isControl) { duplicatedEntityIDs = SelectionManager.duplicateSelection(); var ids = []; for (var i = 0; i < duplicatedEntityIDs.length; ++i) { From f2d591dbe9b45f3a1297091df7dfe7ebd62a6b5b Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 12 Jul 2019 21:28:44 +1200 Subject: [PATCH 2/2] Take no action if Alt is pressed at mouse-down --- .../system/create/entitySelectionTool/entitySelectionTool.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/system/create/entitySelectionTool/entitySelectionTool.js b/scripts/system/create/entitySelectionTool/entitySelectionTool.js index 462b32275a..6774c72627 100644 --- a/scripts/system/create/entitySelectionTool/entitySelectionTool.js +++ b/scripts/system/create/entitySelectionTool/entitySelectionTool.js @@ -1118,6 +1118,11 @@ SelectionDisplay = (function() { return false; } + // No action if the Alt key is pressed. + if (event.isAlt) { + return; + } + var pickRay = generalComputePickRay(event.x, event.y); // TODO_Case6491: Move this out to setup just to make it once var interactiveOverlays = getMainTabletIDs();