mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-13 03:33:48 +00:00
Update Assimp from 5.2.3 to 5.2.5
This commit is contained in:
parent
ea7ca63301
commit
16f3710058
379 changed files with 14469 additions and 47175 deletions
|
|
@ -63,7 +63,7 @@ void ConvertListToStrings(const std::string &in, std::list<std::string> &out) {
|
|||
return;
|
||||
}
|
||||
}
|
||||
out.push_back(std::string(base, (size_t)(s - base)));
|
||||
out.emplace_back(base, (size_t)(s - base));
|
||||
++s;
|
||||
} else {
|
||||
out.push_back(GetNextToken(s));
|
||||
|
|
@ -208,7 +208,7 @@ VertexWeightTable *ComputeVertexBoneWeightTable(const aiMesh *pMesh) {
|
|||
aiBone *bone = pMesh->mBones[i];
|
||||
for (unsigned int a = 0; a < bone->mNumWeights; ++a) {
|
||||
const aiVertexWeight &weight = bone->mWeights[a];
|
||||
avPerVertexWeights[weight.mVertexId].push_back(std::pair<unsigned int, float>(i, weight.mWeight));
|
||||
avPerVertexWeights[weight.mVertexId].emplace_back(i, weight.mWeight);
|
||||
}
|
||||
}
|
||||
return avPerVertexWeights;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue