From 7db99cce6b5d8dcde669e187959a3049a99e2da3 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 2 Nov 2019 12:07:11 +1300 Subject: [PATCH] Fix Cmd-clone entities on Mac --- .../create/entitySelectionTool/entitySelectionTool.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/system/create/entitySelectionTool/entitySelectionTool.js b/scripts/system/create/entitySelectionTool/entitySelectionTool.js index 6774c72627..c1b512cb10 100644 --- a/scripts/system/create/entitySelectionTool/entitySelectionTool.js +++ b/scripts/system/create/entitySelectionTool/entitySelectionTool.js @@ -2047,7 +2047,9 @@ SelectionDisplay = (function() { // 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.isControl || doDuplicate) { + var isMac = Controller.getValue(Controller.Hardware.Application.PlatformMac); + var isControl = isMac ? event.isMeta : event.isControl; + if (isControl || doDuplicate) { duplicatedEntityIDs = SelectionManager.duplicateSelection(); var ids = []; for (var i = 0; i < duplicatedEntityIDs.length; ++i) { @@ -2273,7 +2275,9 @@ SelectionDisplay = (function() { // 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.isControl) { + var isMac = Controller.getValue(Controller.Hardware.Application.PlatformMac); + var isControl = isMac ? event.isMeta : event.isControl; + if (isControl) { duplicatedEntityIDs = SelectionManager.duplicateSelection(); var ids = []; for (var i = 0; i < duplicatedEntityIDs.length; ++i) {