Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster

examples/edit.js

@@ -392,6 +392,11 @@ var toolBar = (function() {
             url,
             file;
 
+        if (!event.isLeftButton) {
+            // if another mouse button than left is pressed ignore it
+            return false;
+        }
+
         clickedOverlay = Overlays.getOverlayAtPoint({
             x: event.x,
             y: event.y

examples/libraries/entitySelectionTool.js

@@ -2340,6 +2340,11 @@ SelectionDisplay = (function () {
 
     that.mousePressEvent = function(event) {
 
+        if (!event.isLeftButton) {
+            // if another mouse button than left is pressed ignore it
+            return false;
+        }
+
         var somethingClicked = false;
         var pickRay = Camera.computePickRay(event.x, event.y);