Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)

#rb None
#jira 0

[CL 4213959 by Jack Porter in Dev-Mobile branch]
This commit is contained in:
Jack Porter
2018-07-16 11:43:36 -04:00
parent 1a864683fd
commit 5434a02fed
1112 changed files with 36961 additions and 17428 deletions

View File

@@ -43,8 +43,11 @@ TSharedRef<FApplicationMode> FAnimationModifiersModule::ExtendApplicationMode(co
void FAnimationModifiersModule::ShutdownModule()
{
// Make sure we unregister the class layout
FPropertyEditorModule& PropertyEditorModule = FModuleManager::LoadModuleChecked<FPropertyEditorModule>("PropertyEditor");
PropertyEditorModule.UnregisterCustomClassLayout("AnimationModifier");
FPropertyEditorModule* PropertyEditorModule = FModuleManager::GetModulePtr<FPropertyEditorModule>("PropertyEditor");
if (PropertyEditorModule)
{
PropertyEditorModule->UnregisterCustomClassLayout("AnimationModifier");
}
// Remove extender delegate
FWorkflowCentricApplication::GetModeExtenderList().RemoveAll([this](FWorkflowApplicationModeExtender& StoredExtender) { return StoredExtender.GetHandle() == Extender.GetHandle(); });