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/CGF/CGFLoader.cpp
+4 -3
View File
@@ -1545,8 +1545,6 @@ namespace ProcessSkinningHelpers
vmax = i2;
}
}
uint32 a = pMesh->m_subsets[m].nFirstVertId;
uint32 b = pMesh->m_subsets[m].nNumVerts;
if (pMesh->m_subsets[m].nFirstVertId != vmin ||
pMesh->m_subsets[m].nNumVerts != vmax - vmin + 1)
{
@@ -2255,7 +2253,9 @@ bool CLoaderCGF::ProcessSkinning()
//init internal morph-targets
MorphTargets* pMorphtarget = pSkinningInfo->m_arrMorphTargets[it];
uint32 numMorphVerts = pMorphtarget->m_arrIntMorph.size();
#if !defined(NDEBUG)
uint32 intVertexCount = pSkinningInfo->m_arrIntVertices.size();
#endif
for (uint32 i = 0; i < numMorphVerts; i++)
{
uint32 idx = pMorphtarget->m_arrIntMorph[i].nVertexId;
@@ -3982,7 +3982,8 @@ bool CLoaderCGF::LoadFoliageInfoChunk(IChunkFile::ChunkDesc* pChunkDesc)
SFoliageInfoCGF& fi = *m_pCGF->GetFoliageInfo();
bool isSkinned = m_pCGF->GetExportInfo()->bSkinnedCGF;
if (fi.nSpines = chunk.nSpines)
fi.nSpines = chunk.nSpines;
if (fi.nSpines)
{
fi.nSkinnedVtx = chunk.nSkinnedVtx;