From dfda9cee4e85ad080f4ceadff00f6c3cc0854ca2 Mon Sep 17 00:00:00 2001 From: graham wihlidal Date: Fri, 16 Feb 2024 20:12:14 -0500 Subject: [PATCH] Fixed merge issue in NaniteVertexFactory.ush [CL 31593369 by graham wihlidal in ue5-main branch] --- Engine/Shaders/Private/Nanite/NaniteVertexFactory.ush | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Engine/Shaders/Private/Nanite/NaniteVertexFactory.ush b/Engine/Shaders/Private/Nanite/NaniteVertexFactory.ush index 52e50a5a4299..cdc478129470 100644 --- a/Engine/Shaders/Private/Nanite/NaniteVertexFactory.ush +++ b/Engine/Shaders/Private/Nanite/NaniteVertexFactory.ush @@ -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);