From 511f7be394228a88949c487195e1245c02de3440 Mon Sep 17 00:00:00 2001 From: Riccardo Corsi Date: Fri, 7 Jun 2019 12:45:45 +0200 Subject: [PATCH] Bugfix due to copy-paste typo which prevented multi uv channel mesh to be imported correctly. --- src/osgPlugins/fbx/fbxRMesh.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/osgPlugins/fbx/fbxRMesh.cpp b/src/osgPlugins/fbx/fbxRMesh.cpp index b2310cb80..207204926 100644 --- a/src/osgPlugins/fbx/fbxRMesh.cpp +++ b/src/osgPlugins/fbx/fbxRMesh.cpp @@ -476,17 +476,17 @@ std::string getUVChannelForTextureMap(std::vector& stateSetList { if (stateSetList[i].diffuse.valid() && (0 == strcmp(pName, FbxSurfaceMaterial::sDiffuse))) return stateSetList[i].diffuse->channel; - if (stateSetList[i].shininess.valid() && (0 == strcmp(pName, FbxSurfaceMaterial::sTransparentColor))) + if (stateSetList[i].opacity.valid() && (0 == strcmp(pName, FbxSurfaceMaterial::sTransparentColor))) return stateSetList[i].opacity->channel; - if (stateSetList[i].shininess.valid() && (0 == strcmp(pName, FbxSurfaceMaterial::sReflection))) + if (stateSetList[i].reflection.valid() && (0 == strcmp(pName, FbxSurfaceMaterial::sReflection))) return stateSetList[i].reflection->channel; - if (stateSetList[i].shininess.valid() && (0 == strcmp(pName, FbxSurfaceMaterial::sEmissive))) + if (stateSetList[i].emissive.valid() && (0 == strcmp(pName, FbxSurfaceMaterial::sEmissive))) return stateSetList[i].emissive->channel; - if (stateSetList[i].shininess.valid() && (0 == strcmp(pName, FbxSurfaceMaterial::sAmbient))) + if (stateSetList[i].ambient.valid() && (0 == strcmp(pName, FbxSurfaceMaterial::sAmbient))) return stateSetList[i].ambient->channel; - if (stateSetList[i].shininess.valid() && (0 == strcmp(pName, FbxSurfaceMaterial::sNormalMap))) + if (stateSetList[i].normalMap.valid() && (0 == strcmp(pName, FbxSurfaceMaterial::sNormalMap))) return stateSetList[i].normalMap->channel; - if (stateSetList[i].shininess.valid() && (0 == strcmp(pName, FbxSurfaceMaterial::sSpecular))) + if (stateSetList[i].specular.valid() && (0 == strcmp(pName, FbxSurfaceMaterial::sSpecular))) return stateSetList[i].specular->channel; if (stateSetList[i].shininess.valid() && (0 == strcmp(pName, FbxSurfaceMaterial::sShininess))) return stateSetList[i].shininess->channel;