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
@@ -1357,12 +1357,17 @@ int OnWaterUpdate(const EventPhysAreaChange* pEvent)
void CWaterVolumeRenderNode::SyncToPhysMesh(const QuatT& qtSurface, IGeometry* pSurface, float depth)
{
mesh_data* pmd;
if (!pSurface || pSurface->GetType() != GEOM_TRIMESH || !(pmd = (mesh_data*)pSurface->GetData()))
if (!pSurface || pSurface->GetType() != GEOM_TRIMESH)
{
return;
}
bool bResized = false;
if (bResized = m_waterSurfaceVertices.size() != pmd->nVertices)
pmd = (mesh_data*)pSurface->GetData();
if (!pmd)
{
return;
}
bool bResized = m_waterSurfaceVertices.size() != pmd->nVertices;
if (bResized)
{
m_waterSurfaceVertices.resize(pmd->nVertices);
}