birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating github/staging through commit ab87ed9

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
Code/CryEngine/Cry3DEngine/ObjectsTree_Serialize.cpp
+3 -3
View File
@@ -522,12 +522,12 @@ void COctreeNode::LoadSingleObject(byte*& pPtr, [[maybe_unused]] std::vector<ISt
{
for (uint32 j(0); j < pChunk->m_numVertices; ++j)
{
SWaterVolumeVertex* pVertex(StepData<SWaterVolumeVertex>(pPtr, eEndian));
StepData<SWaterVolumeVertex>(pPtr, eEndian);
}
for (uint32 j(0); j < pChunk->m_numVerticesPhysAreaContour; ++j)
{
SWaterVolumeVertex* pVertex(StepData<SWaterVolumeVertex>(pPtr, eEndian));
StepData<SWaterVolumeVertex>(pPtr, eEndian);
}
return;
@@ -537,7 +537,7 @@ void COctreeNode::LoadSingleObject(byte*& pPtr, [[maybe_unused]] std::vector<ISt
int auxCntSrc = pChunk->m_volumeTypeAndMiscBits >> 24, auxCntDst;
float* pAuxDataDst = pObj->GetAuxSerializationDataPtr(auxCntDst);
const float* pAuxDataSrc = StepData<float>(pPtr, auxCntSrc, eEndian);
StepData<float>(pPtr, auxCntSrc, eEndian);
memcpy(pAuxDataDst, pAuxDataDst, min(auxCntSrc, auxCntDst) * sizeof(float));
// read common node data