Commit Graph

3323 Commits (d094dfc3a1f7119ea1974e6e617c5abf36f596cc)

Author SHA1 Message Date
Kim Kulling d094dfc3a1 Merge pull request #800 from pkholland/master
Can't add integer to string pointer
2016-04-01 10:01:23 +02:00
Kim Kulling 49d60dc856 Merge pull request #832 from assimp/no-boost
Removed usage of Boost static assert.
2016-03-31 15:42:53 +02:00
Kim Kulling b573676a1b Update CMakeLists.txt
Enable c++11 support manually by using the compiler flags.
2016-03-31 11:26:38 +02:00
Kim Kulling c53903ff0b Update CMakeLists.txt
Enable c++11 support for this branch.
2016-03-31 11:11:55 +02:00
Kim Kulling 1d8dba13d5 Merge pull request #837 from stevenjt/python3-xrange-fix
Python 3 compatibility fix for xrange in PyAssimp
2016-03-30 00:12:14 +02:00
Kim Kulling 0a002986e2 Merge pull request #839 from boxdot/master
Import reflectance factor from Blender.
2016-03-30 00:11:38 +02:00
boxdot 0d44479399 Import reflectance factor from Blender. 2016-03-29 21:16:26 +02:00
Steven Thompson 2c3bbe041a Set xrange to range for Python 3.0 and above 2016-03-27 20:12:22 +01:00
Kim Kulling 1592a18210 PLYLoader: fix review comments. 2016-03-25 00:09:56 +01:00
Kim Kulling 42d29b1bfe Merge branch 'master' of https://github.com/assimp/assimp 2016-03-24 19:54:33 +01:00
Kim Kulling 7c71f0b7a9 PLYLoader: improve readability by refactorings. 2016-03-24 19:53:15 +01:00
Kim Kulling 6be4d82a6b Merge pull request #835 from robertliebo/VCS-1030/ObjMtlFilenameFallback
Vcs 1030/obj mtl filename fallback
2016-03-22 20:35:41 +01:00
Kim Kulling 23892a6ded FBX: add debugging tool to log class type + info. 2016-03-22 20:30:25 +01:00
Kim Kulling ca0fa2ba69 FBX-Importer: put debug printf into comments. 2016-03-22 20:25:29 +01:00
Robert Liebo 124fc9ae27 [VCS-1030] add log info about .mtl fallback 2016-03-22 18:39:52 +01:00
Robert Liebo abb3e6b854 [VCS-1030] fallback for non-found .mtl file: try file name of original obj with just the file extension replaced by "mtl" 2016-03-22 18:38:28 +01:00
Sherief Farouk 397fa374a3 Removed usage of Boost static assert. 2016-03-18 17:02:39 -07:00
Kim Kulling 76e4e82ecb FBX: fix https://github.com/assimp/assimp/issues/782 2016-03-16 20:26:33 +01:00
Kim Kulling 644d6a9a67 Collada: refactorings. 2016-03-15 21:17:38 +01:00
Kim Kulling d89e7943ad FBX Close issue-806: support version 7400. 2016-03-15 21:16:47 +01:00
Kim Kulling 29067c0dfc Merge branch 'master' of https://github.com/assimp/assimp 2016-03-15 19:29:14 +01:00
Kim Kulling e3d7ca264c Collada: reset workaround. 2016-03-15 19:28:57 +01:00
Kim Kulling 2dd71acdfd Merge pull request #821 from Wietse/build-with-nmake-fix
Update CMakeLists.txt
2016-03-15 00:30:03 +01:00
Wietse 8314a20c56 Update CMakeLists.txt
Changed "add_definitions" to "add_compile_options" to fix building with NMake.
Using "add_definitions" adds "/MP" to the resource compiler options which results in a fatal error when run with NMake.
2016-03-14 23:14:31 +01:00
Kim Kulling 3a7c3a5698 Test for issue-731: possible overflow. 2016-03-14 21:00:08 +01:00
Kim Kulling 7e9fe2d654 OpenGEX: use correct number of uv-coordinates for texture coordinates. 2016-03-13 20:22:36 +01:00
Kim Kulling 193f6059cf Merge pull request #820 from turol/master
Fix some crashes on malformed input
2016-03-13 19:58:04 +01:00
Turo Lamminen 555f533777 MD3: Check file is big enough to contain all the advertised surfaces 2016-03-13 00:57:08 +02:00
Turo Lamminen da0b180901 MD3: Fix crash on invalid vertex index 2016-03-13 00:57:08 +02:00
Turo Lamminen b0f453dba8 MD2: Check file is big enough to contain all the advertised frames 2016-03-13 00:57:08 +02:00
Turo Lamminen 8d2af995de MD2: Fix integer overflows on malformed input 2016-03-13 00:57:08 +02:00
Turo Lamminen e2361bf209 MDL: Fix read past end of buffer on malformed input 2016-03-12 22:35:54 +02:00
Kim Kulling 6ee5fdf567 OpenGEX: fix review finding. 2016-03-12 20:55:11 +01:00
Kim Kulling b4b303ab55 OpenGEX: fix alloc for texture coordinates. 2016-03-12 13:22:09 +01:00
Kim Kulling 8872e96183 Merge pull request #819 from emvivre/master
PlyParser: fix invalid loading when comment is empty.
2016-03-11 13:40:27 +01:00
emvivre 93be0f69da PlyParser: fix invalid loading when comment is empty. 2016-03-10 17:47:07 +01:00
Kim Kulling 98ba2d2310 Update Readme.md
Readme: fix typo
2016-03-04 16:45:40 +01:00
Kim Kulling 80f4e69938 Merge pull request #813 from tgoulart/obj_loader_leak
Fix memory leak in OBJ loader when a mesh has no faces.
2016-03-04 16:41:57 +01:00
Kim Kulling f774bde20b Merge pull request #814 from tgoulart/xcode6_builds_again
Add missing files  so that xcode6 project builds successfully
2016-03-04 16:40:50 +01:00
Thiago Goulart 3c9e57fd73 Fix memory leak in OBJ loader when a mesh has no faces. 2016-03-04 03:40:47 -08:00
Thiago Goulart 1e5632b3b8 Add missing files (and required includes) so that xcode6 project builds succesfully. 2016-03-04 03:39:10 -08:00
Kim Kulling 072e38403e Update Readme.md
README: move donate to a special chapter.
2016-03-04 11:13:07 +01:00
Kim Kulling f51f5f8291 Update Readme.md
README: Add link to donate page.
2016-03-04 11:12:11 +01:00
Kim Kulling 53370d0d31 FBXImporter: some refactorings to increase readability. 2016-03-03 18:38:50 +01:00
Kim Kulling 26fba14aaf Merge branch 'master' of https://github.com/assimp/assimp 2016-03-03 15:20:22 +01:00
Kim Kulling 2b09199f4a FBXImporter: move MeshGeometry declaration into its own header 2016-03-03 15:19:38 +01:00
Kim Kulling e7c3a733b6 Merge pull request #812 from tgoulart/fix_switch_warning
Fix warning when compiling using -Wswitch-enum
2016-03-02 21:16:42 +01:00
Thiago Goulart 17f0e09bd1 Fix warning when compiling using -Wswitch-enum 2016-03-02 00:07:17 -08:00
Kim Kulling 3079b90622 Importer: when the right importer was found log this info. 2016-02-29 15:57:47 +01:00
Kim Kulling e9f47b08c5 FBXImporter: fx build. 2016-02-28 20:56:11 +01:00