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

BP Compilation Manager: added additional matching conditions to find old CDO during reinstancing for control rig bp use case

Browse Source 
#jira UE-121234
#rb michael.noland phillip.kavan
#preflight skip

#ROBOMERGE-SOURCE: CL 17161939 via CL 17161975
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)

[CL 17161986 by jack cai in ue5-release-engine-test branch]
This commit is contained in:
jack cai
2021-08-12 20:41:09 -04:00
parent b7c5c7bece
commit 35e7a32b81
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Engine/Source/Editor/Kismet/Private/BlueprintCompilationManager.cpp
View File

@@ -2179,7 +2179,15 @@ void FBlueprintCompilationManagerImpl::ReinstanceBatch(TArray<FReinstancingJob>&
for (int32 i = 0; i < CurrentLinker->ExportMap.Num(); i++)
{
FObjectExport& ThisExport = CurrentLinker->ExportMap[i];
if (ThisExport.ObjectFlags & RF_ClassDefaultObject)
// In addition to checking for RF_ClassDefaultObject, we also need to check if the object names
// match to for Control Rig BP use case
//
// In a normal Blueprint, there is usually just 1 CDO in the package, so name checking was not necessary.
//
// But in a Control Rig BP, multiple CDO can be in a package because custom UClasses are used to describe
// the layout of RigVM Memory Storage. These UClasses and their CDO are serialzed with the package as well.
// Thus, we have to ensure that the export is not just a CDO, but also a CDO with the matching name
if ((ThisExport.ObjectFlags & RF_ClassDefaultObject) && (ThisExport.ObjectName == CurrentBP->GeneratedClass->ClassDefaultObject->GetFName()))
{
OldCDOIndex = i;
break;