Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 11:48:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

When picking a color highlight only single entity in a group

Browse source
This commit is contained in:
David Rowe 2017-08-29 18:03:31 +12:00
parent 78876d39b4
commit 758442999d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/vr-edit/vr-edit.js
View file

@ -657,7 +657,7 @@
selection.select(intersectedEntityID); selection.select(intersectedEntityID);
if (toolSelected !== TOOL_SCALE || !otherEditor.isEditing(rootEntityID)) { if (toolSelected !== TOOL_SCALE || !otherEditor.isEditing(rootEntityID)) {
highlights.display(intersection.handIntersected, selection.selection(), highlights.display(intersection.handIntersected, selection.selection(),
toolSelected === TOOL_COLOR ? selection.intersectedEntityIndex() : null, toolSelected === TOOL_COLOR || toolSelected === TOOL_PICK_COLOR ? selection.intersectedEntityIndex() : null,
toolSelected === TOOL_SCALE || otherEditor.isEditing(rootEntityID) toolSelected === TOOL_SCALE || otherEditor.isEditing(rootEntityID)
? highlights.SCALE_COLOR : highlights.HIGHLIGHT_COLOR); ? highlights.SCALE_COLOR : highlights.HIGHLIGHT_COLOR);
} }
@ -669,7 +669,7 @@
selection.select(intersectedEntityID); selection.select(intersectedEntityID);
if (toolSelected !== TOOL_SCALE || !otherEditor.isEditing(rootEntityID)) { if (toolSelected !== TOOL_SCALE || !otherEditor.isEditing(rootEntityID)) {
highlights.display(intersection.handIntersected, selection.selection(), highlights.display(intersection.handIntersected, selection.selection(),
toolSelected === TOOL_COLOR ? selection.intersectedEntityIndex() : null, toolSelected === TOOL_COLOR || toolSelected === TOOL_PICK_COLOR ? selection.intersectedEntityIndex() : null,
toolSelected === TOOL_SCALE || otherEditor.isEditing(rootEntityID) toolSelected === TOOL_SCALE || otherEditor.isEditing(rootEntityID)
? highlights.SCALE_COLOR : highlights.HIGHLIGHT_COLOR); ? highlights.SCALE_COLOR : highlights.HIGHLIGHT_COLOR);
} else { } else {