Merge branch 'main' into Atom/dmcdiar/ATOM-15555

# Conflicts: # Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp # Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp
2021-05-26 21:57:43 -07:00
parent 9f8948556f 9b1be43367
commit 8223f241b5
480 changed files with 6020 additions and 2353 deletions
@@ -780,6 +780,7 @@ namespace AZ
                [[maybe_unused]] bool result = modelLod->GetStreamsForMesh(
                    inputStreamLayout,
                    streamBufferViews,
+                    nullptr,
                    shaderInputContract,
                    meshIndex,
                    materialAssignment.m_matModUvOverrides,