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

This commit is contained in:
David Back 2018-03-07 10:30:18 -08:00
commit 2047437893

View file

@ -1319,8 +1319,9 @@ SelectionDisplay = (function() {
isActiveTool(handleScaleRTFCube) || isActiveTool(handleStretchXSphere) ||
isActiveTool(handleStretchYSphere) || isActiveTool(handleStretchZSphere));
var showOutlineForZone = (SelectionManager.selections.length === 1 &&
SelectionManager.savedProperties[SelectionManager.selections[0]].type === "Zone");
var showOutlineForZone = (SelectionManager.selections.length === 1 &&
typeof SelectionManager.savedProperties[SelectionManager.selections[0]] !== "undefined" &&
SelectionManager.savedProperties[SelectionManager.selections[0]].type === "Zone");
that.setHandleScaleEdgeVisible(showOutlineForZone || (!isActiveTool(handleRotatePitchRing) &&
!isActiveTool(handleRotateYawRing) &&
!isActiveTool(handleRotateRollRing)));