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

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

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

..

assimp_cmd.rc

Assimp_cmd: Drop malformed version spec from rc file.

2014-06-14 22:47:18 +02:00

CMakeLists.txt

add openddl_parser directly to assimp.

2015-03-19 11:37:58 +01:00

CompareDump.cpp

Merge remote-tracking branch 'origin'

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

Export.cpp

- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.

2012-02-03 03:38:30 +00:00

generic_inserter.hpp

- Update XML output written by assimp dump. cameras & lights missing, document scheme as well. No guarantees that I won't change it in future without further notice (currently WIP, format to be freezed with our next release).

2010-03-13 00:04:21 +00:00

ImageExtractor.cpp

Bugfix : Commit not saved changes.

2012-03-20 22:41:39 +00:00

Info.cpp

Avoid division by zero in assimp_cmd info when scene loading succeeds but contains no meshes

2015-01-25 22:30:10 +02:00

Main.cpp

Fixed assimp_cmd version message

2014-05-19 14:56:39 +02:00

Main.h

remove AssimpPCH.h: fixes #534

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

resource.h

General

2009-03-05 22:32:13 +00:00

WriteDumb.cpp

remove AssimpPCH.h: fixes #534

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