Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-21 14:40:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed Parenting/Unparenting Menu Removal and Binding

Browse source
This commit is contained in:
Menithal 2017-02-16 10:52:42 +02:00
parent 7a5665ff4f
commit afbf4bc30f
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/system/edit.js
View file

@ -969,8 +969,8 @@ function cleanupModelMenus() {
Menu.removeMenuItem("Edit", "Delete"); Menu.removeMenuItem("Edit", "Delete");
} }
Menu.removeMenuItem("Edit", "Parent"); Menu.removeMenuItem("Edit", "Parent Entity to Last");
Menu.removeMenuItem("Edit", "Unparent"); Menu.removeMenuItem("Edit", "Unparent Entity");
Menu.removeMenuItem("Edit", "Entity List..."); Menu.removeMenuItem("Edit", "Entity List...");
Menu.removeMenuItem("Edit", "Allow Selecting of Large Models"); Menu.removeMenuItem("Edit", "Allow Selecting of Large Models");
Menu.removeMenuItem("Edit", "Allow Selecting of Small Models"); Menu.removeMenuItem("Edit", "Allow Selecting of Small Models");
@ -1134,10 +1134,8 @@ function parentSelectedEntities() {
return; return;
} }
var lastEntityId = selectedEntities[selectedEntities.length-1]; var lastEntityId = selectedEntities[selectedEntities.length-1];
selectedEntities.forEach(function (id, index) { selectedEntities.forEach(function (id, index) {
if (lastEntityId !== id) { if (lastEntityId !== id) {
// OK time to check why this breaks!
Entities.editEntity(id, {parentID: lastEntityId}) Entities.editEntity(id, {parentID: lastEntityId})
} }
}); });
@ -1208,9 +1206,9 @@ function handeMenuEvent(menuItem) {
Entities.setLightsArePickable(Menu.isOptionChecked("Allow Selecting of Lights")); Entities.setLightsArePickable(Menu.isOptionChecked("Allow Selecting of Lights"));
} else if (menuItem === "Delete") { } else if (menuItem === "Delete") {
deleteSelectedEntities(); deleteSelectedEntities();
} else if (menuItem === "Parent") { } else if (menuItem === "Parent Entity to Last") {
parentSelectedEntities(); parentSelectedEntities();
} else if (menuItem === "Unparent") { } else if (menuItem === "Unparent Entity") {
unparentSelectedEntities(); unparentSelectedEntities();
} else if (menuItem === "Export Entities") { } else if (menuItem === "Export Entities") {
if (!selectionManager.hasSelection()) { if (!selectionManager.hasSelection()) {
@ -1378,7 +1376,7 @@ Controller.keyReleaseEvent.connect(function (event) {
grid.setPosition(newPosition); grid.setPosition(newPosition);
} }
} else if (event.text === 'p' && event.isControl ) { } else if (event.text === 'p' && event.isControl ) {
if (event.isAlt) { if (event.isShifted) {
unparentSelectedEntities(); unparentSelectedEntities();
} else { } else {
parentSelectedEntities(); parentSelectedEntities();