diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-04-05 14:34:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-05 14:34:31 +0200 |
| commit | b80b072c44cfc4f6ec1bfecc045374597eb296e0 (patch) | |
| tree | 39544b604c8be6cf6daa56a2a7774426d394c2a3 /modules/fbx/fbx_parser/FBXMaterial.cpp | |
| parent | 33b8f1448e3efd8ad71c65c3d42581fae82905a3 (diff) | |
| parent | d83761ba80b90e17aaefaa83c7ece0fa89511266 (diff) | |
Merge pull request #47642 from akien-mga/clang-tidy-fixes
Diffstat (limited to 'modules/fbx/fbx_parser/FBXMaterial.cpp')
| -rw-r--r-- | modules/fbx/fbx_parser/FBXMaterial.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/fbx/fbx_parser/FBXMaterial.cpp b/modules/fbx/fbx_parser/FBXMaterial.cpp index 9970a2b0b1..219da1b2f4 100644 --- a/modules/fbx/fbx_parser/FBXMaterial.cpp +++ b/modules/fbx/fbx_parser/FBXMaterial.cpp @@ -171,7 +171,7 @@ Material::~Material() { // ------------------------------------------------------------------------------------------------ Texture::Texture(uint64_t id, const ElementPtr element, const Document &doc, const std::string &name) : - Object(id, element, name), uvScaling(1.0f, 1.0f), media(nullptr) { + Object(id, element, name), uvScaling(1.0f, 1.0f) { const ScopePtr sc = GetRequiredScope(element); const ElementPtr Type = sc->GetElement("Type"); @@ -267,10 +267,10 @@ LayeredTexture::LayeredTexture(uint64_t id, const ElementPtr element, const Docu ElementPtr BlendModes = sc->GetElement("BlendModes"); ElementPtr Alphas = sc->GetElement("Alphas"); - if (BlendModes != 0) { + if (BlendModes != nullptr) { blendMode = (BlendMode)ParseTokenAsInt(GetRequiredToken(BlendModes, 0)); } - if (Alphas != 0) { + if (Alphas != nullptr) { alpha = ParseTokenAsFloat(GetRequiredToken(Alphas, 0)); } } @@ -297,7 +297,7 @@ void LayeredTexture::fillTexture(const Document &doc) { // ------------------------------------------------------------------------------------------------ Video::Video(uint64_t id, const ElementPtr element, const Document &doc, const std::string &name) : - Object(id, element, name), contentLength(0), content(0) { + Object(id, element, name) { const ScopePtr sc = GetRequiredScope(element); const ElementPtr Type = sc->GetElement("Type"); |