Merge remote-tracking branch 'github/master' into contrib

2017-03-17 12:13:52 +01:00
parent 9ef234b842 a182faacbf
commit d4ead31c18
142 changed files with 503 additions and 398 deletions
--- a/code/IFCLoader.cpp
+++ b/code/IFCLoader.cpp
@@ -58,10 +58,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #include "IFCUtil.h"

-#include "StreamReader.h"
 #include "MemoryIOWrapper.h"
 #include <assimp/scene.h>
 #include <assimp/Importer.hpp>
+#include <assimp/importerdesc.h>


 namespace Assimp {