Merge branch 'master' into step-import

2018-10-07 16:22:32 +02:00
parent 619e09fbec 07e22fd3fc
commit e84ccaea15
22 changed files with 365 additions and 127 deletions
--- a/code/Importer/IFC/IFCReaderGen_4.cpp
+++ b/code/Importer/IFC/IFCReaderGen_4.cpp
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_IFC_IMPORTER

 #include "AssimpPCH.h"
-#include "IFCReaderGen4.h"
+#include "IFCReaderGen_4.h"

 namespace Assimp {
 using namespace IFC;