mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 05:37:17 +02:00
Fix unresolve merge conflict
This commit is contained in:
parent
a9ed09a742
commit
c421adaf58
1 changed files with 0 additions and 3 deletions
|
@ -933,15 +933,12 @@ function handeMenuEvent(menuItem) {
|
||||||
}
|
}
|
||||||
} else if (menuItem == "Entity List...") {
|
} else if (menuItem == "Entity List...") {
|
||||||
entityListTool.toggleVisible();
|
entityListTool.toggleVisible();
|
||||||
<<<<<<< HEAD
|
|
||||||
} else if (menuItem == "Select All Entities In Box") {
|
} else if (menuItem == "Select All Entities In Box") {
|
||||||
selectAllEtitiesInCurrentSelectionBox(false);
|
selectAllEtitiesInCurrentSelectionBox(false);
|
||||||
} else if (menuItem == "Select All Entities Touching Box") {
|
} else if (menuItem == "Select All Entities Touching Box") {
|
||||||
selectAllEtitiesInCurrentSelectionBox(true);
|
selectAllEtitiesInCurrentSelectionBox(true);
|
||||||
=======
|
|
||||||
} else if (menuItem == MENU_SHOW_LIGHTS_IN_EDIT_MODE) {
|
} else if (menuItem == MENU_SHOW_LIGHTS_IN_EDIT_MODE) {
|
||||||
lightOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_LIGHTS_IN_EDIT_MODE));
|
lightOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_LIGHTS_IN_EDIT_MODE));
|
||||||
>>>>>>> dfd39ca1e14bb2198b12374b6bc863b3c27f673c
|
|
||||||
}
|
}
|
||||||
tooltip.show(false);
|
tooltip.show(false);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue