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/ObjFileImporter.cpp
+++ b/code/ObjFileImporter.cpp
@@ -51,6 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/scene.h>
 #include <assimp/ai_assert.h>
 #include <assimp/DefaultLogger.hpp>
+#include <assimp/importerdesc.h>

 static const aiImporterDesc desc = {
    "Wavefront Object Importer",