diff --git a/src/Magnum/Trade/FlatMaterialData.cpp b/src/Magnum/Trade/FlatMaterialData.cpp index ee2700bc2..def1bb81e 100644 --- a/src/Magnum/Trade/FlatMaterialData.cpp +++ b/src/Magnum/Trade/FlatMaterialData.cpp @@ -44,9 +44,9 @@ bool FlatMaterialData::hasTextureTransformation() const { } bool FlatMaterialData::hasTextureCoordinates() const { - return (hasAttribute(MaterialAttribute::BaseColorTexture) && hasAttribute(MaterialAttribute::BaseColorTextureCoordinates)) || - (hasAttribute(MaterialAttribute::DiffuseTexture) && hasAttribute(MaterialAttribute::DiffuseTextureCoordinates)) || - hasAttribute(MaterialAttribute::TextureCoordinates); + return (hasAttribute(MaterialAttribute::BaseColorTexture) && attributeOr(MaterialAttribute::BaseColorTextureCoordinates, 0u)) || + (hasAttribute(MaterialAttribute::DiffuseTexture) && attributeOr(MaterialAttribute::DiffuseTextureCoordinates, 0u)) || + attributeOr(MaterialAttribute::TextureCoordinates, 0u); } Color4 FlatMaterialData::color() const { diff --git a/src/Magnum/Trade/PbrClearCoatMaterialData.cpp b/src/Magnum/Trade/PbrClearCoatMaterialData.cpp index 796cc048e..e88fd47af 100644 --- a/src/Magnum/Trade/PbrClearCoatMaterialData.cpp +++ b/src/Magnum/Trade/PbrClearCoatMaterialData.cpp @@ -67,11 +67,11 @@ bool PbrClearCoatMaterialData::hasCommonTextureTransformation() const { } bool PbrClearCoatMaterialData::hasTextureCoordinates() const { - return hasAttribute(MaterialAttribute::LayerFactorTextureCoordinates) || - hasAttribute(MaterialAttribute::RoughnessTextureCoordinates) || - hasAttribute(MaterialAttribute::NormalTextureCoordinates) || - hasAttribute(MaterialAttribute::TextureCoordinates) || - hasAttribute(0, MaterialAttribute::TextureCoordinates); + return attributeOr(MaterialAttribute::LayerFactorTextureCoordinates, 0u) || + attributeOr(MaterialAttribute::RoughnessTextureCoordinates, 0u) || + attributeOr(MaterialAttribute::NormalTextureCoordinates, 0u) || + attributeOr(MaterialAttribute::TextureCoordinates, 0u) || + attributeOr(0, MaterialAttribute::TextureCoordinates, 0u); } bool PbrClearCoatMaterialData::hasCommonTextureCoordinates() const { diff --git a/src/Magnum/Trade/PbrClearCoatMaterialData.h b/src/Magnum/Trade/PbrClearCoatMaterialData.h index 6fa9ff71b..b2f1c1a39 100644 --- a/src/Magnum/Trade/PbrClearCoatMaterialData.h +++ b/src/Magnum/Trade/PbrClearCoatMaterialData.h @@ -119,8 +119,9 @@ class MAGNUM_TRADE_EXPORT PbrClearCoatMaterialData: public MaterialLayerData