Skip to content

AssetGenerator: save simple assets (MaterialInstance, MPC, PhysMat, DataAsset...) after data population - 5.6.1 regression #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
UresiiZo wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

AssetGenerator: save simple assets (MaterialInstance, MPC, PhysMat, DataAsset...) after data population - 5.6.1 regression #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...or/Source/AssetGenerator/Private/Toolkit/AssetTypeGenerator/MaterialInstanceGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@ void UMaterialInstanceGenerator::PreFinishAssetGeneration() {
const TSharedPtr<FJsonValue> AssetUserDataJson = AssetObjectProperties->GetField<EJson::Array>(TEXT("AssetUserData"));

GetPropertySerializer()->DeserializePropertyValue(AssetUserDataProperty, AssetUserDataJson.ToSharedRef(), AssetUserData);

// AssetUserData is deserialized in PRE_FINSHED, after the
// DATA_POPULATION save. Without marking the asset changed the package is not re-saved and the
// AssetUserData written here is lost (IsSimpleAssetUpToDate then fails on every re-run).
MarkAssetChanged();
}

void EnsureStaticSwitchNodesPresent(UMaterial* Material, const FStaticParameterSet& StaticParameters) {
Expand Down
10 changes: 10 additions & 0 deletions ...nerator/Source/AssetGenerator/Private/Toolkit/AssetTypeGenerator/SimpleAssetGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@ void USimpleAssetGenerator::PopulateAssetWithData() {
UE_LOG(LogAssetGenerator, Display, TEXT("%s %s is not up to date, regenerating data"), *ExistingAssetObject->GetClass()->GetName(), *ExistingAssetObject->GetPathName());

PopulateSimpleAssetWithData(ExistingAssetObject);

// Commit d665fd6 ("Update to UE 5.6.1")
// moved data population out of CreateAssetPackage() (CONSTRUCTION, which always marks
// the asset changed) into this DATA_POPULATION stage, but never marks the asset as
// changed here. UAssetTypeGenerator::AdvanceGenerationState only saves when
// bAssetChanged is set, and the property serializer does not dirty the package, so
// every simple asset (MaterialInstance, PhysicalMaterial, MPC, DataAsset, curves...)
// was written to disk as the empty CONSTRUCTION shell and the populated data was lost.
// Marking the asset changed makes AdvanceGenerationState save the populated package.
MarkAssetChanged();
}
}

Expand Down