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

Fixed merge issue in NaniteVertexFactory.ush

Browse Source 
[CL 31593369 by graham wihlidal in ue5-main branch]
This commit is contained in:
graham wihlidal
2024-02-16 20:12:14 -05:00
parent 6b9e7aa6c7
commit dfda9cee4e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Engine/Shaders/Private/Nanite/NaniteVertexFactory.ush
View File

@@ -366,8 +366,6 @@ FNaniteTransformedTri TransformNaniteTriangle(FPrimitiveSceneData PrimitiveData,
GetCustomInterpolators(VertexParameters, Tri.Verts[i].CustomizedUVs);
#endif
const float3 WorldPositionOffset = GetMaterialWorldPositionOffset(VertexParameters);
const float3 NormalWorld = mul(float4(InVerts[i].Normal, 0), Transforms.LocalToTranslatedWorld).xyz;
Tri.Verts[i].VertIndex = InVerts[i].VertIndex;
@@ -389,6 +387,8 @@ FNaniteTransformedTri TransformNaniteTriangle(FPrimitiveSceneData PrimitiveData,
BRANCH
if (bEvaluateWPO)
{
const float3 WorldPositionOffset = GetMaterialWorldPositionOffset(VertexParameters);
FMaterialVertexParameters PrevVertexParameters = MakeInitializedMaterialVertexParameters();
SetVertexParameterInstanceData(PrevVertexParameters, InstanceData, PrimitiveData, true /* WPO */);
SetVertexParameterAttributeData(PrevVertexParameters, InVerts[i], Transforms.PrevLocalToTranslatedWorld, Transforms.PrevLocalToWorldNoScale);