Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 05:37:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #9939 from ctrlaltdavid/21237

Browse source 
Disable Developer > Assets > ATP Asset Migration menu item
This commit is contained in:
Chris Collins 2017-03-20 06:29:33 -07:00 committed by GitHub
commit ed27c550af
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Menu.cpp
View file

@ -417,6 +417,9 @@ Menu::Menu() {
} }
// Developer > Assets >>> // Developer > Assets >>>
// Menu item is not currently needed but code should be kept in case it proves useful again at some stage.
//#define WANT_ASSET_MIGRATION
#ifdef WANT_ASSET_MIGRATION
MenuWrapper* assetDeveloperMenu = developerMenu->addMenu("Assets"); MenuWrapper* assetDeveloperMenu = developerMenu->addMenu("Assets");
auto& atpMigrator = ATPAssetMigrator::getInstance(); auto& atpMigrator = ATPAssetMigrator::getInstance();
atpMigrator.setDialogParent(this); atpMigrator.setDialogParent(this);
@ -424,6 +427,7 @@ Menu::Menu() {
addActionToQMenuAndActionHash(assetDeveloperMenu, MenuOption::AssetMigration, addActionToQMenuAndActionHash(assetDeveloperMenu, MenuOption::AssetMigration,
0, &atpMigrator, 0, &atpMigrator,
SLOT(loadEntityServerFile())); SLOT(loadEntityServerFile()));
#endif
// Developer > Avatar >>> // Developer > Avatar >>>
MenuWrapper* avatarDebugMenu = developerMenu->addMenu("Avatar"); MenuWrapper* avatarDebugMenu = developerMenu->addMenu("Avatar");