abma
|
1c1f3c25f8
|
awww, merge error
|
2015-04-16 03:13:19 +02:00 |
|
abma
|
8c45a4dc3b
|
Merge remote-tracking branch 'origin'
Conflicts:
code/C4DImporter.cpp
code/OgreImporter.h
|
2015-04-16 01:03:00 +02:00 |
|
abma
|
bf4913b5c9
|
remove AssimpPCH.h: fixes #534
|
2015-04-16 01:00:17 +02:00 |
Alexander Gessler
|
14324c60cf
|
Add missing ASSIMP_BUILD_NO_C4D_IMPORTER check to C4DImporter.cpp. Fixes #503.
|
2015-03-22 17:53:53 +01:00 |
ulf
|
b71ded1ad0
|
- manually merged C4D importer code from acgessler branch
- manually merged IFC bugfixes and improvements from schrompf branch
|
2015-02-23 14:23:28 +01:00 |