mirror of
https://github.com/overte-org/overte.git
synced 2025-04-25 00:56:48 +02:00
Merge branch 'master' of https://github.com/highfidelity/hifi into animenu
This commit is contained in:
commit
5b65406012
1 changed files with 6 additions and 2 deletions
|
@ -666,13 +666,17 @@ Menu.menuItemEvent.connect(function(menuItem){
|
|||
print("menuItemEvent() in JS... menuItem=" + menuItem);
|
||||
if (menuItem == "Delete Model") {
|
||||
if (leftController.grabbing) {
|
||||
print(" Delete Model.... controller.modelID="+ leftController.modelID);
|
||||
print(" Delete Model.... leftController.modelID="+ leftController.modelID);
|
||||
Models.deleteModel(leftController.modelID);
|
||||
leftController.grabbing = false;
|
||||
} else if (rightController.grabbing) {
|
||||
print(" Delete Model.... controller.modelID="+ rightController.modelID);
|
||||
print(" Delete Model.... rightController.modelID="+ rightController.modelID);
|
||||
Models.deleteModel(rightController.modelID);
|
||||
rightController.grabbing = false;
|
||||
} else if (modelSelected) {
|
||||
print(" Delete Model.... selectedModelID="+ selectedModelID);
|
||||
Models.deleteModel(selectedModelID);
|
||||
modelSelected = false;
|
||||
} else {
|
||||
print(" Delete Model.... not holding...");
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue