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

Fix creating an entity while a tool is active

Browse source
This commit is contained in:
David Rowe 2017-10-06 11:13:53 +13:00
parent 1673c08353
commit 5587a2fdf8
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/shapes/shapes.js
View file

@ -979,7 +979,9 @@
&& (!wasTriggerClicked || isAutoGrab) && isTriggerClicked) { && (!wasTriggerClicked || isAutoGrab) && isTriggerClicked) {
intersectedEntityID = intersection.entityID; intersectedEntityID = intersection.entityID;
rootEntityID = Entities.rootOf(intersectedEntityID); rootEntityID = Entities.rootOf(intersectedEntityID);
if (otherEditor.isEditing(rootEntityID)) { if (isAutoGrab) {
setState(EDITOR_GRABBING);
} else if (otherEditor.isEditing(rootEntityID)) {
if (toolSelected !== TOOL_SCALE) { if (toolSelected !== TOOL_SCALE) {
setState(EDITOR_DIRECT_SCALING); setState(EDITOR_DIRECT_SCALING);
} }
@ -1013,10 +1015,10 @@
selection.deleteEntities(); selection.deleteEntities();
setState(EDITOR_SEARCHING); setState(EDITOR_SEARCHING);
} else { } else {
setState(EDITOR_GRABBING); log(side, "ERROR: Editor: Unexpected condition A in EDITOR_SEARCHING!");
} }
} else { } else {
log(side, "ERROR: Editor: Unexpected condition in EDITOR_SEARCHING!"); log(side, "ERROR: Editor: Unexpected condition B in EDITOR_SEARCHING!");
} }
break; break;
case EDITOR_HIGHLIGHTING: case EDITOR_HIGHLIGHTING: