v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4167 from assimp/kimkulling-fix_uninitialized_attribs_issue-4158 

Update anim.h
pull/4165/head^2
Kim Kulling 2021-11-10 09:34:52 +01:00 committed by GitHub
parent 83950845ee 5fd2a5559c
commit d4755648b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/assimp/anim.h
View File

@ -98,6 +98,7 @@ struct aiVectorKey {
bool operator<(const aiVectorKey &rhs) const { bool operator<(const aiVectorKey &rhs) const {
return mTime < rhs.mTime; return mTime < rhs.mTime;
} }
bool operator>(const aiVectorKey &rhs) const { bool operator>(const aiVectorKey &rhs) const {
return mTime > rhs.mTime; return mTime > rhs.mTime;
} }
@ -131,6 +132,7 @@ struct aiQuatKey {
bool operator==(const aiQuatKey &rhs) const { bool operator==(const aiQuatKey &rhs) const {
return rhs.mValue == this->mValue; return rhs.mValue == this->mValue;
} }
bool operator!=(const aiQuatKey &rhs) const { bool operator!=(const aiQuatKey &rhs) const {
return rhs.mValue != this->mValue; return rhs.mValue != this->mValue;
} }
@ -139,6 +141,7 @@ struct aiQuatKey {
bool operator<(const aiQuatKey &rhs) const { bool operator<(const aiQuatKey &rhs) const {
return mTime < rhs.mTime; return mTime < rhs.mTime;
} }
bool operator>(const aiQuatKey &rhs) const { bool operator>(const aiQuatKey &rhs) const {
return mTime > rhs.mTime; return mTime > rhs.mTime;
} }

8
include/assimp/mesh.h
View File

@ -300,6 +300,10 @@ struct aiBone {
aiBone() AI_NO_EXCEPT aiBone() AI_NO_EXCEPT
: mName(), : mName(),
mNumWeights(0), mNumWeights(0),
#ifndef ASSIMP_BUILD_NO_ARMATUREPOPULATE_PROCESS
mArmature(nullptr),
mNode(nullptr),
#endif
mWeights(nullptr), mWeights(nullptr),
mOffsetMatrix() { mOffsetMatrix() {
// empty // empty
@ -309,6 +313,10 @@ struct aiBone {
aiBone(const aiBone &other) : aiBone(const aiBone &other) :
mName(other.mName), mName(other.mName),
mNumWeights(other.mNumWeights), mNumWeights(other.mNumWeights),
#ifndef ASSIMP_BUILD_NO_ARMATUREPOPULATE_PROCESS
mArmature(nullptr),
mNode(nullptr),
#endif
mWeights(nullptr), mWeights(nullptr),
mOffsetMatrix(other.mOffsetMatrix) { mOffsetMatrix(other.mOffsetMatrix) {
if (other.mWeights && other.mNumWeights) { if (other.mWeights && other.mNumWeights) {