Merge pull request #9939 from ctrlaltdavid/21237

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

View file

@ -417,6 +417,9 @@ Menu::Menu() {
}
// 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");
auto& atpMigrator = ATPAssetMigrator::getInstance();
atpMigrator.setDialogParent(this);
@ -424,6 +427,7 @@ Menu::Menu() {
addActionToQMenuAndActionHash(assetDeveloperMenu, MenuOption::AssetMigration,
0, &atpMigrator,
SLOT(loadEntityServerFile()));
#endif
// Developer > Avatar >>>
MenuWrapper* avatarDebugMenu = developerMenu->addMenu("Avatar");