Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'RC67' of github.com:highfidelity/hifi into RC67

Browse source
This commit is contained in:
Dante Ruiz 2018-05-04 14:20:57 -07:00
commit 607de3dfb4
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/system/controllers/controllerModules/mouseHighlightEntities.js
View file

@ -12,10 +12,11 @@
/* jslint bitwise: true */
/* global Script, print, Entities, Picks, HMD, Controller, MyAvatar*/
/* global Script, print, Entities, Picks, HMD, Controller, MyAvatar, isInEditMode*/
(function() {
Script.include("/~/system/libraries/utils.js");
var dispatcherUtils = Script.require("/~/system/libraries/controllerDispatcherUtils.js");
function MouseHighlightEntities() {
@ -39,7 +40,7 @@
dispatcherUtils.unhighlightTargetEntity(this.highlightedEntity);
this.highlightedEntity = null;
}
} else if (!this.grabbedEntity) {
} else if (!this.grabbedEntity && !isInEditMode()) {
var pickResult = controllerData.mouseRayPick;
if (pickResult.type === Picks.INTERSECTED_ENTITY) {
var targetEntityID = pickResult.objectID;