merge master and adjust assimp/DefaultIOSystem.h

2017-03-27 22:35:19 +08:00
parent 8cd0d3b3c7 63485bdd26
commit 51dae22828
150 changed files with 636 additions and 474 deletions
--- a/code/AssbinLoader.cpp
+++ b/code/AssbinLoader.cpp
@@ -54,6 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/mesh.h>
 #include <assimp/anim.h>
 #include <assimp/scene.h>
+#include <assimp/importerdesc.h>

 #ifdef ASSIMP_BUILD_NO_OWN_ZLIB
 #   include <zlib.h>