Merge branch 'master' into issue_1583

pull/1764/head
Kim Kulling 2018-02-03 17:22:32 +01:00 committed by GitHub
commit 61816837e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 578 additions and 574 deletions

View File

@ -40,13 +40,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/** MACHINE-GENERATED by scripts/ICFImporter/CppGenerator.py */
#include "AssimpPCH.h"
#ifndef ASSIMP_BUILD_NO_IFC_IMPORTER
#include "IFCReaderGen.h"
#include "AssimpPCH.h"
#include "IFCReaderGen4.h"
namespace Assimp {
using namespace IFC;
using namespace ::Assimp::IFC::Schema_4;
namespace {

File diff suppressed because it is too large Load Diff