diff --git a/code/MDLFileData.h b/code/MDLFileData.h index 7b0b2cea9..bc5e589f9 100644 --- a/code/MDLFileData.h +++ b/code/MDLFileData.h @@ -920,10 +920,10 @@ struct IntSharedData_MDL7 // ------------------------------------------------------------------------------------- //! Contains input data for GenerateOutputMeshes_3DGS_MDL7 -struct IntSplittedGroupData_MDL7 +struct IntSplitGroupData_MDL7 { //! Construction from a given shared data set - IntSplittedGroupData_MDL7(IntSharedData_MDL7& _shared, + IntSplitGroupData_MDL7(IntSharedData_MDL7& _shared, std::vector& _avOutList) : shared(_shared), avOutList(_avOutList) @@ -931,7 +931,7 @@ struct IntSplittedGroupData_MDL7 } //! Destruction: properly delete all allocated resources - ~IntSplittedGroupData_MDL7() + ~IntSplitGroupData_MDL7() { // kill all face lists if(this->aiSplit) diff --git a/code/MDLLoader.cpp b/code/MDLLoader.cpp index 3f5476ce2..f2e7178f2 100644 --- a/code/MDLLoader.cpp +++ b/code/MDLLoader.cpp @@ -1193,7 +1193,7 @@ bool MDLImporter::ProcessFrames_3DGS_MDL7(const MDL::IntGroupInfo_MDL7& groupInf void MDLImporter::SortByMaterials_3DGS_MDL7( const MDL::IntGroupInfo_MDL7& groupInfo, MDL::IntGroupData_MDL7& groupData, - MDL::IntSplittedGroupData_MDL7& splitGroupData) + MDL::IntSplitGroupData_MDL7& splitGroupData) { const unsigned int iNumMaterials = (unsigned int)splitGroupData.shared.pcMats.size(); if (!groupData.bNeed2UV) { @@ -1438,7 +1438,7 @@ void MDLImporter::InternReadFile_3DGS_MDL7( ) szCurrent += pcHeader->mainvertex_stc_size * groupInfo.pcGroup->numverts; VALIDATE_FILE_SIZE(szCurrent); - MDL::IntSplittedGroupData_MDL7 splitGroupData(sharedData,avOutList[iGroup]); + MDL::IntSplitGroupData_MDL7 splitGroupData(sharedData,avOutList[iGroup]); MDL::IntGroupData_MDL7 groupData; if (groupInfo.pcGroup->numtris && groupInfo.pcGroup->numverts) { @@ -1773,7 +1773,7 @@ void MDLImporter::AddAnimationBoneTrafoKey_3DGS_MDL7(unsigned int iTrafo, // Construct output meshes void MDLImporter::GenerateOutputMeshes_3DGS_MDL7( MDL::IntGroupData_MDL7& groupData, - MDL::IntSplittedGroupData_MDL7& splitGroupData) + MDL::IntSplitGroupData_MDL7& splitGroupData) { const MDL::IntSharedData_MDL7& shared = splitGroupData.shared; diff --git a/code/MDLLoader.h b/code/MDLLoader.h index 3035119a7..b5a5f8418 100644 --- a/code/MDLLoader.h +++ b/code/MDLLoader.h @@ -406,7 +406,7 @@ protected: void SortByMaterials_3DGS_MDL7( const MDL::IntGroupInfo_MDL7& groupInfo, MDL::IntGroupData_MDL7& groupData, - MDL::IntSplittedGroupData_MDL7& splitGroupData); + MDL::IntSplitGroupData_MDL7& splitGroupData); // ------------------------------------------------------------------- /** Read all faces and vertices from a MDL7 group. The function fills @@ -424,7 +424,7 @@ protected: */ void GenerateOutputMeshes_3DGS_MDL7( MDL::IntGroupData_MDL7& groupData, - MDL::IntSplittedGroupData_MDL7& splitGroupData); + MDL::IntSplitGroupData_MDL7& splitGroupData); protected: