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

Prevent landscape material instances validation/recompilation if not in the editor or a commandlet (we cannot re-build material instance constants otherwise)

Browse Source 
#rb sebastien.lussier
#jira UE-138693
#preflight 61dd5f03917ab97716a96332

#ROBOMERGE-AUTHOR: jonathan.bard
#ROBOMERGE-SOURCE: CL 18571500 via CL 18571516 via CL 18571531 via CL 18571972 via CL 18571996 via CL 18572025
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Test -> Main) (v899-18417669)

[CL 18572047 by jonathan bard in ue5-main branch]
This commit is contained in:
jonathan bard
2022-01-11 10:17:30 -05:00
parent 2c8a7c2275 eadcd1f9d8
commit eed62df351
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Engine/Source/Runtime/Landscape/Private/Landscape.cpp
View File

@@ -2577,8 +2577,8 @@ void ALandscapeProxy::PostLoad()
if (UMaterialInstance* MaterialInstance = Comp->GetMaterialInstance(0, false))
{
UMaterialInstanceConstant* CombinationMaterialInstance = Cast<UMaterialInstanceConstant>(MaterialInstance->Parent);
// Only validate if uncooked
if (!Comp->GetOutermost()->HasAnyPackageFlags(PKG_FilterEditorOnly))
// Only validate if uncooked and in the editor/commandlet mode (we cannot re-build material instance constants if this is not the case : see UMaterialInstance::CacheResourceShadersForRendering, which is only called if FApp::CanEverRender() returns true)
if (!Comp->GetOutermost()->HasAnyPackageFlags(PKG_FilterEditorOnly) && (GIsEditor && FApp::CanEverRender()))
{
if (Comp->ValidateCombinationMaterial(CombinationMaterialInstance))
{