From 5ea06e1bb69e4b61c3f05160c9c38ed1187a5102 Mon Sep 17 00:00:00 2001
From: JeffH-BMG <37119778+JeffH-BMG@users.noreply.github.com>
Date: Tue, 6 Mar 2018 14:50:02 -0500
Subject: [PATCH 1/2] Add support for texture file in PLY exports

The PLY format has an unofficial way to specify an associated texture, using the "comment TextureFile"  comment line. The PLY loader supports this, but the exporter does not. The change looks for a diffuse texture in the scene's materials, and if it finds one, it adds it to the exported mesh using "comment TextureFile".
---
 code/PlyExporter.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/code/PlyExporter.cpp b/code/PlyExporter.cpp
index 0ddba0d2a..2d528c96c 100644
--- a/code/PlyExporter.cpp
+++ b/code/PlyExporter.cpp
@@ -148,6 +148,17 @@ PlyExporter::PlyExporter(const char* _filename, const aiScene* pScene, bool bina
         << aiGetVersionMajor() << '.' << aiGetVersionMinor() << '.'
         << aiGetVersionRevision() << ")" << endl;
 
+    // Look through materials for a diffuse texture, and add it if found
+    for ( unsigned int i = 0; i < pScene->mNumMaterials; ++i )
+    {
+        const aiMaterial* const mat = pScene->mMaterials[i];
+        aiString s;
+        if ( AI_SUCCESS == mat->Get( AI_MATKEY_TEXTURE_DIFFUSE( 0 ), s ) )
+        {
+            mOutput << "comment TextureFile " << s.data << endl;
+        }
+    }
+
     // TODO: probably want to check here rather than just assume something
     //       definitely not good to always write float even if we might have double precision
 

From 2d980c16f0359c3c2e78bd71c86627aa97c705b0 Mon Sep 17 00:00:00 2001
From: Sergey Gonchar <gonchar@fb.com>
Date: Thu, 15 Mar 2018 21:41:40 -0700
Subject: [PATCH 2/2] Support Maya 2018 Collada Export with blendshapes and
 bones controllers for a mesh

---
 code/ColladaParser.cpp | 16 ++++++++++++++++
 code/ColladaParser.h   |  3 +++
 2 files changed, 19 insertions(+)

diff --git a/code/ColladaParser.cpp b/code/ColladaParser.cpp
index d62c5cafc..d96ac0d39 100644
--- a/code/ColladaParser.cpp
+++ b/code/ColladaParser.cpp
@@ -222,6 +222,7 @@ void ColladaParser::ReadStructure()
     }
 
 	PostProcessRootAnimations();
+    PostProcessControllers();
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -360,6 +361,21 @@ void ColladaParser::ReadAnimationClipLibrary()
 	}
 }
 
+void ColladaParser::PostProcessControllers()
+{
+  for (ControllerLibrary::iterator it = mControllerLibrary.begin(); it != mControllerLibrary.end(); ++it)
+  {
+    std::string meshId = it->second.mMeshId;
+    ControllerLibrary::iterator findItr = mControllerLibrary.find(meshId);
+    while(findItr != mControllerLibrary.end()) {
+      meshId = findItr->second.mMeshId;
+      findItr = mControllerLibrary.find(meshId);
+    }
+    
+    it->second.mMeshId = meshId;
+  }
+}
+
 // ------------------------------------------------------------------------------------------------
 // Re-build animations from animation clip library, if present, otherwise combine single-channel animations
 void ColladaParser::PostProcessRootAnimations()
diff --git a/code/ColladaParser.h b/code/ColladaParser.h
index 566386840..21f741551 100644
--- a/code/ColladaParser.h
+++ b/code/ColladaParser.h
@@ -87,6 +87,9 @@ namespace Assimp
 		/** Reads the animation clip library */
 		void ReadAnimationClipLibrary();
 
+        /** Unwrap controllers dependency hierarchy */
+        void PostProcessControllers();
+    
 		/** Re-build animations from animation clip library, if present, otherwise combine single-channel animations */
 		void PostProcessRootAnimations();