izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

[INTEGRATE] Change 2446219 by Dan.Oconnor@epic_3298 on 2015/02/14 21:11:35

Browse Source 
[UE-9497] Clear the blueprint's generated class's CDO before deleting the blueprint, otherwise it gets redirected to the replacing type and that causes a an assertion

	#lockdown Nick.Whiting

[CL 2449925 by Matthew Griffin in Main branch]
This commit is contained in:
Matthew Griffin
2015-02-18 06:39:11 -05:00
parent ac3e0f0418
commit 9420572981
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Engine/Source/Editor/UnrealEd/Private/ObjectTools.cpp
View File

@@ -802,6 +802,14 @@ namespace ObjectTools
UPackage* CurObjPackage = CurObjToConsolidate->GetOutermost();
FName CurObjName = CurObjToConsolidate->GetFName();
// null out the CDO of our current generated class so that DeleteSingleObject does not find it and set it's ClassGeneratedBy to the replacing type.
// That would trigger a type mismatch assertion...
UBlueprint* BlueprintToConsolidate = Cast<UBlueprint>(CurObjToConsolidate);
if (BlueprintToConsolidateTo != nullptr && BlueprintToConsolidate != nullptr && BlueprintToConsolidate->GeneratedClass != nullptr)
{
BlueprintToConsolidate->GeneratedClass->ClassDefaultObject = nullptr;
}
// Attempt to delete the object that was consolidated
if ( DeleteSingleObject( CurObjToConsolidate ) )
{