Commit Graph

239 Commits (facffffc59dd59a0daf02273583fbd2f2a8c023f)

Author SHA1 Message Date
Kim Kulling e64f2e5efe Merge branch 'master' into coverity_scan 2016-05-13 14:28:11 +02:00
Kim Kulling 97145a7f20 Replace std:.endl by backslash n. 2016-04-27 17:59:12 +02:00
Kim Kulling 388694e349 cmake build env: add missing license info. 2016-04-23 09:42:27 +02:00
Kim Kulling 829e56df0c cmake env: add license info. 2016-04-23 09:42:05 +02:00
mensinda dd1ab0778c Fixed AnimEvaluator.cpp 2016-04-06 17:28:09 +02:00
mensinda cc0fce8568 Replaced boost::timer with std::chrono 2016-04-06 10:13:02 +02:00
mensinda ae99f99b99 Replaced boost::tuple with std::tuple 2016-04-06 00:17:21 +02:00
Eric Engestrom 87e7cf00a2 Fix spelling mistakes 2016-04-03 01:38:00 +01:00
Sherief Farouk 397fa374a3 Removed usage of Boost static assert. 2016-03-18 17:02:39 -07:00
Kim Kulling 6cf639956a Merge branch 'master' into coverity_scan 2016-02-26 12:29:21 +01:00
Kim Kulling df9bb8b915 Update license date. 2016-01-21 19:53:25 +01:00
Kim Kulling 96169560cc Merge branch 'master' into coverity_scan 2016-01-07 14:13:28 +01:00
Kim Kulling d43a083dc1 snprintf replacement: fix usage of ai_snprintf when snprintf is available. 2016-01-06 19:25:35 +01:00
Kim Kulling fb123ab1b2 trigger build. 2015-12-30 12:28:51 +01:00
Kim Kulling d7602930c0 coverity: add modeling file. 2015-12-29 20:45:02 +01:00
rmitton 957426ed72 Tiny misc fixes for documentation 2015-12-13 22:12:25 -08:00
IOhannes m zmölnig 989e8af3fb fix argument check for assimp cmdline tool
`assimp cmpdump` expects two files as arguments.
so we need to check for at least 2 extra arguments (rather than only check
for !<1 and access both)
2015-11-13 22:33:53 +01:00
Kim Kulling 36f0ccced1 Merge branch 'master' of https://github.com/assimp/assimp
Conflicts:
	tools/assimp_cmd/ImageExtractor.cpp
2015-07-08 00:40:35 +02:00
Kim Kulling bc8aa18eb2 Fix : https://github.com/assimp/assimp/issues/557 2015-07-08 00:34:28 +02:00
Alexander Gessler cf4cb6caef Merge pull request #598 from LegalizeAdulthood/cppcheck-null
Fix char buffer issues found by cppcheck
2015-07-05 13:46:54 +02:00
Kim Kulling 931cb7da71 Merge pull request #599 from LegalizeAdulthood/cppcheck-printf
Fixed: Use %u for unsigned int, not %i in printf
2015-07-04 09:51:04 +02:00
Kim Kulling 68f88752b3 Build: fix missing commas. 2015-07-04 09:22:11 +02:00
Richard dd609767f2 Fixed: Use proper printf format specifier for unsigned integers 2015-07-03 19:39:05 -06:00
Richard b6cf553ff5 Fixed: Use correct printf format specifier for unsigned integers 2015-07-03 19:38:59 -06:00
Richard e3ebef0094 Fixed: Correct null pointer dereference 2015-07-03 19:33:58 -06:00
Richard 8d82bf3338 Fixed: Ensure string buffers are NUL terminated. 2015-07-03 19:33:58 -06:00
Kim Kulling d763483c67 Merge pull request #596 from LegalizeAdulthood/init-variables
Initialize all members in c'tors
2015-07-03 15:36:58 +02:00
Richard b34b5d4207 Fixed: Plug FILE* resource leak 2015-07-02 20:55:56 -06:00
Richard c331df69d7 Fixed: Initialize all members in MeshHelper 2015-07-02 20:51:46 -06:00
Richard c25690f0e4 Refactor: Use LF line endings for source files 2015-07-02 20:51:45 -06:00
Richard 5ae1c28881 Refactor: Apply editor config rules to tools 2015-06-29 20:54:59 -06:00
Richard 1d96486437 Refactored: Reformat CMake files to conform to editor config 2015-06-28 15:50:57 -06:00
Kim Kulling 2bfc353fde License info: update year info. 2015-06-28 21:48:25 +02:00
Peter LaValle db8b973aec wrapped the CRT warning macro
I already have these in an outer-script
2015-05-31 11:52:04 +01:00
Léo Terziman 825a58803d Removed some warning about const char* used as char* (not our choice, it depends of some external API) 2015-04-28 17:30:15 +02:00
Léo Terziman d809ca98c1 Fixed compilation issues with mingw 2015-04-28 15:16:53 +02:00
Kim Kulling 76dd9467b2 fix win32-build for assimp_viewer .
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-17 20:02:55 +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 e5d4f537bd CompareDump: do not use C++11 range based for loop. 2015-03-28 13:10:34 +01:00
Alexander Gessler ce7b3af1d7 CompareDump: fix typo in light compare code.
Brings regression suite local runs to 100%.
2015-03-28 12:53:08 +01:00
Alexander Gessler e2addcee77 CompareDump: fix reporting bugs. The top stack entry was missing (!) and we had an off-by-one in the index computation.
Also, all of this should be rewritten from scratch.
2015-03-28 12:51:46 +01:00
Alexander Gessler e0dd061dcb CompareDump: add debug trace of past push/pop operations to assist debugging. 2015-03-28 12:46:15 +01:00
Kim Kulling 12efa14777 add openddl_parser directly to assimp.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-19 11:37:58 +01:00
Kim Kulling 2717d51f7e Merge remote-tracking branch 'origin/master' into opengex_support
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>

Conflicts:
	code/ParsingUtils.h
2015-03-17 14:26:39 +01:00
Alexander Gessler 09c15331c4 Improve error reporting during dump diffing. 2015-03-15 21:01:34 +01:00
Kim Kulling d9d7dd31ea fix linker error: undefined references to openddl_parser.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-11 19:05:37 +01:00
Turo Lamminen 5a74e07f5f Mark some more functions with AI_WONT_RETURN 2015-02-27 23:09:12 +02:00
Kim Kulling b700cd917f Merge pull request #452 from ricortiz/FixExportedLibraryNameVariable
Fix exported library name variable
2015-01-29 17:24:30 +01:00
Turo Lamminen b97c26b1d2 Avoid division by zero in assimp_cmd info when scene loading succeeds but contains no meshes 2015-01-25 22:30:10 +02:00