Integrating github/staging through commit ab87ed9

This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -630,7 +630,6 @@ bool CGeomCacheRenderNode::FillFrameAsync(const char* const pFloorFrameData, con
// Update meshes & clear instances
for (uint meshId = 0; meshId < numMeshes; ++meshId)
{
const SGeomCacheStaticMeshData& meshData = staticMeshData[meshId];
for (TRenderElementMap::iterator iter = m_pRenderElements.begin(); iter != m_pRenderElements.end(); ++iter)
{
SGeomCacheRenderElementData& data = iter->second;
@@ -827,8 +826,6 @@ void CGeomCacheRenderNode::FillRenderObject(const SRendParams& rendParams, [[may
{
FUNCTION_PROFILER_3DENGINE;
IRenderNode* const pRenderNode = rendParams.pRenderNode;
IRenderer* const pRenderer = GetRenderer();
pRenderObject->m_pRenderNode = rendParams.pRenderNode;
pRenderObject->m_fSort = rendParams.fCustomSortOffset;
@@ -1450,7 +1447,6 @@ void CGeomCacheRenderNode::UpdatePhysicalMaterials()
void CGeomCacheRenderNode::UpdateStreamableComponents(float fImportance, float fDistance, bool bFullUpdate, int nLod, const float fInvScale, bool bDrawNear)
{
IObjManager* pObjManager = GetObjManager();
Matrix34A matrix = GetMatrix();
const bool bAllowStandIn = GetCVars()->e_Lods != 0;