abma 8c45a4dc3b Merge remote-tracking branch 'origin' ...

Conflicts:
	code/C4DImporter.cpp
	code/OgreImporter.h

2015-04-16 01:03:00 +02:00

..

headercheck

add option ASSIMP_HEADERCHECK (defaults to off):

2015-04-15 21:06:40 +02:00

models

Merge remote-tracking branch 'origin/master' into opengex_support

2015-03-17 14:26:39 +01:00

models-nonbsd

[FBX] add support for multiple animations (by using LocalStart/LocalStop in takes)

2015-03-26 23:23:38 +02:00

other

Add first WIP version of a TrueSpace loader. Currently only ASCII COB/SCNs are supported.

2010-04-02 04:17:05 +00:00

regression

Merge remote-tracking branch 'origin'

2015-04-16 01:03:00 +02:00

unit

remove AssimpPCH.h: fixes #534

2015-04-16 01:00:17 +02:00

CMakeLists.txt

remove AssimpPCH.h: fixes #534

2015-04-16 01:00:17 +02:00