Merge branch 'master' of https://github.com/assimp/assimp

2017-03-11 22:13:48 +01:00
parent 43a3d2c539 4450d77312
commit bb7f387bcf
111 changed files with 338 additions and 333 deletions
--- a/code/Importer.cpp
+++ b/code/Importer.cpp
@@ -45,6 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #include <assimp/version.h>
 #include <assimp/config.h>
+#include <assimp/importerdesc.h>

 // ------------------------------------------------------------------------------------------------
 /* Uncomment this line to prevent Assimp from catching unknown exceptions.