From f82bd441a955e4cfc38378483d70d8de92f01e1d Mon Sep 17 00:00:00 2001 From: samcake Date: Wed, 9 Mar 2016 10:34:49 -0800 Subject: [PATCH] IMproving th ecomment --- libraries/fbx/src/FBXReader_Material.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/fbx/src/FBXReader_Material.cpp b/libraries/fbx/src/FBXReader_Material.cpp index 60c1e747c0..fb272a1af9 100644 --- a/libraries/fbx/src/FBXReader_Material.cpp +++ b/libraries/fbx/src/FBXReader_Material.cpp @@ -79,8 +79,8 @@ void FBXReader::consolidateFBXMaterials() { QString diffuseTextureID = diffuseTextures.value(material.materialID); QString diffuseFactorTextureID = diffuseFactorTextures.value(material.materialID); + // If both factor and color textures are specified, the texture bound to DiffuseColor wins if (!diffuseFactorTextureID.isNull() || !diffuseTextureID.isNull()) { - // If both factor and color are specified, the texture bound to DiffuseColor wins if (!diffuseFactorTextureID.isNull() && diffuseTextureID.isNull()) { diffuseTextureID = diffuseFactorTextureID; // If the diffuseTextureID comes from the Texture bound to DiffuseFactor, we know it s exported from maya