Merge pull request #1988 from kebby/master

FBX: LayeredTextures now work with embedded texture data

code/FBXConverter.cpp

@@ -1526,23 +1526,13 @@ unsigned int Converter::ConvertVideo( const Video& video )
     return static_cast<unsigned int>( textures.size() - 1 );
 }
 
-void Converter::TrySetTextureProperties( aiMaterial* out_mat, const TextureMap& textures,
+aiString Converter::GetTexturePath(const Texture* tex)
-    const std::string& propName,
-    aiTextureType target, const MeshGeometry* const mesh )
 {
-    TextureMap::const_iterator it = textures.find( propName );
-    if ( it == textures.end() ) {
-        return;
-    }
-
-    const Texture* const tex = ( *it ).second;
-    if ( tex != 0 )
-    {
     aiString path;
-        path.Set( tex->RelativeFilename() );
+    path.Set(tex->RelativeFilename());
 
     const Video* media = tex->Media();
-        if (media != 0) {
+    if (media != nullptr) {
         bool textureReady = false; //tells if our texture is ready (if it was loaded or if it was found)
         unsigned int index;
 
@@ -1573,6 +1563,22 @@ void Converter::TrySetTextureProperties( aiMaterial* out_mat, const TextureMap&
         }
     }
 
+    return path;
+}
+
+void Converter::TrySetTextureProperties( aiMaterial* out_mat, const TextureMap& textures,
+    const std::string& propName,
+    aiTextureType target, const MeshGeometry* const mesh )
+{
+    TextureMap::const_iterator it = textures.find( propName );
+    if ( it == textures.end() ) {
+        return;
+    }
+
+    const Texture* const tex = ( *it ).second;
+    if ( tex != 0 )
+    {
+        aiString path = GetTexturePath(tex);
         out_mat->AddProperty( &path, _AI_MATKEY_TEXTURE_BASE, target, 0 );
 
         aiUVTransform uvTrafo;
@@ -1696,9 +1702,7 @@ void Converter::TrySetTextureProperties( aiMaterial* out_mat, const LayeredTextu
     
         const Texture* const tex = ( *it ).second->getTexture(texIndex);
 
-        aiString path;
+        aiString path = GetTexturePath(tex);
-        path.Set( tex->RelativeFilename() );
-
         out_mat->AddProperty( &path, _AI_MATKEY_TEXTURE_BASE, target, texIndex );
 
         aiUVTransform uvTrafo;

code/FBXConverter.h

@@ -228,6 +228,10 @@ private:
     // Video -> aiTexture
     unsigned int ConvertVideo(const Video& video);
 
+    // ------------------------------------------------------------------------------------------------
+    // convert embedded texture if necessary and return actual texture path
+    aiString GetTexturePath(const Texture* tex);
+
     // ------------------------------------------------------------------------------------------------
     void TrySetTextureProperties(aiMaterial* out_mat, const TextureMap& textures,
         const std::string& propName,