2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-10 15:25:53 +00:00

Merge pull request #114 from lioncash/model

CModel: Implement CModelFlags' operator!= in terms of operator==
This commit is contained in:
Phillip Stephens 2019-10-26 17:51:40 -07:00 committed by GitHub
commit 83c0ad1e72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -58,10 +58,7 @@ struct CModelFlags {
x4_color == other.x4_color; x4_color == other.x4_color;
} }
bool operator!=(const CModelFlags& other) const { bool operator!=(const CModelFlags& other) const { return !operator==(other); }
return x0_blendMode != other.x0_blendMode || x1_matSetIdx != other.x1_matSetIdx || x2_flags != other.x2_flags ||
x4_color != other.x4_color;
}
}; };
/* urde addition: doesn't require hacky stashing of /* urde addition: doesn't require hacky stashing of