Commit Graph

6629 Commits

Author SHA1 Message Date
Kim Kulling
ebcea3cb02 Merge branch 'master' into a-bunch-of-fixes 2018-11-29 20:34:13 +01:00
Martin Jeřábek
4f767ecd13 Apply suggestions from code review
* make the copy constructors explicitly defaulted
* split compound assert
2018-11-28 14:19:46 +01:00
Kim Kulling
ef8b61237d Merge pull request #2243 from bubba/gltf2-anim-fix
Fix skins not always being loaded in GlTF2
2018-11-28 02:52:56 +01:00
Kim Kulling
47e3301c47 Update glTF2Asset.inl
Remove my nonsense, sorry!
2018-11-27 23:22:09 +01:00
Kim Kulling
657014dff6 Update glTF2Asset.inl
Fix possible nullptr-dereferencing.
2018-11-27 20:18:00 +01:00
Luke Lau
d44e25350f Merge branch 'master' into gltf2-anim-fix 2018-11-27 11:49:40 +00:00
Luke Lau
0bb672c6fa Fix scenes not always being loaded 2018-11-27 11:45:53 +00:00
Kim Kulling
0a57ab22fb Merge branch 'master' into a-bunch-of-fixes 2018-11-26 22:13:35 +01:00
Kim Kulling
5fceb89300 Merge pull request #2241 from assimp/kimkulling-patch-3
Update Build.md
2018-11-26 22:13:22 +01:00
Martin Jeřábek
770356a55b AssbinLoader: fix setting mNumChildren and releasing the smart pointer 2018-11-26 15:10:48 +01:00
Martin Jeřábek
a916c7b1e3 ensure that GitVersion fits into 32 bits 2018-11-26 12:06:38 +01:00
Martin Jeřábek
65a79029ec eliminate some compiler warnings by making copy constructors implicitly defaulted
Addresses #2222
2018-11-26 12:06:38 +01:00
Martin Jerabek
a7cbb4386c 3DSLoader: exception-safety
Fixes memory leaks and/or crashes on malformed input.
2018-11-26 12:06:08 +01:00
Martin Jerabek
6e95601875 OpenDDLParserUtils: replace chartype_table with simple comparison 2018-11-26 12:06:08 +01:00
Martin Jeřábek
430fe98c53 AssbinLoader: hardening, exception safety
Fixes potential memory leaks and crashes on malformed input.
2018-11-26 12:06:08 +01:00
Martin Jerabek
66599b6392 Assbin: fix loading/exporting compressed format 2018-11-26 12:06:08 +01:00
Martin Jerabek
e8e8578d7f assimp_cmd: fix writing compressed binary assimp format
Also print someting to console when compression fails.
2018-11-26 12:06:08 +01:00
Kim Kulling
4231844647 Update Build.md
Fix typos and try to make build doc more explicit.
2018-11-25 20:56:28 +01:00
Kim Kulling
396b518ecb Update Build.md
Some doc improvements.
2018-11-25 20:16:49 +01:00
Kim Kulling
7df35ebc36 Merge pull request #2240 from assimp/issue_2202
closes https://github.com/assimp/assimp/issues/2202: put STEPParser o…
2018-11-25 12:45:59 +01:00
Kim Kulling
02359ea369 closes https://github.com/assimp/assimp/issues/2202: put STEPParser out of IFC importer. 2018-11-25 12:00:51 +01:00
Kim Kulling
de52431126 Merge pull request #2239 from assimp/issue_2210
closes https://github.com/assimp/assimp/issues/2210: use different en…
2018-11-25 11:42:41 +01:00
Kim Kulling
d03e978c1b closes https://github.com/assimp/assimp/issues/2210: use different enum value. 2018-11-25 10:45:45 +01:00
Kim Kulling
837a0742c4 Merge pull request #2236 from rdb/patch-1
Fix static init ordering issue in 3mf importer
2018-11-24 13:29:34 +01:00
Kim Kulling
23af5336d5 Update D3MFImporter.cpp
Avoid using extension twice.
2018-11-23 20:21:58 +01:00
rdb
e595410de1 Fix static init ordering issue in 3mf importer 2018-11-23 20:04:16 +01:00
Kim Kulling
d98f8bbf7b Merge pull request #2235 from assimp/issue_2229
closes https://github.com/assimp/assimp/issues/2229: fix count of pol…
2018-11-22 10:13:57 +01:00
Kim Kulling
a24502577f DXF-Importer: some small review findings. 2018-11-21 22:00:11 +01:00
Kim Kulling
f00154802c Issue 2229: add a unittest. 2018-11-21 21:39:16 +01:00
Kim Kulling
9ae8efcf09 closes https://github.com/assimp/assimp/issues/2229: fix count of polylines when only one vertex was indexed. 2018-11-21 21:29:09 +01:00
Kim Kulling
793694a4b1 Merge pull request #2232 from assimp/doc_fix_deprecated_stuff
Dox: remove parts about boost support - already replaced by c++11.
2018-11-19 23:59:20 +01:00
Kim Kulling
4b4f18fb31 Dox: remove parts about boost support - already replaced by c++11. 2018-11-19 21:46:02 +01:00
Kim Kulling
fa686e4bd3 Merge pull request #2223 from matt77hias/C4703
C4703 workaround for msvc++
2018-11-16 19:29:13 +01:00
Matthias Moulin
0535b28908 nullptr instead of NULL 2018-11-16 12:17:12 +01:00
Matthias Moulin
48ee14c64e C4703 workaround for msvc++
`error C4703: potentially uninitialized local pointer variable 'pcFirstFrame'` in debug mode
2018-11-14 21:20:27 +01:00
Kim Kulling
e6905b6a5b Merge pull request #2215 from ruyo/gltf_skinmesh
glTF2 importer multiple primitives and 16-bit index buffer skinmesh support.
2018-11-13 16:07:10 +01:00
Kim Kulling
9bf4425239 Merge branch 'master' into gltf_skinmesh 2018-11-13 09:13:01 +01:00
Kim Kulling
3d57b86349 Merge pull request #2217 from assimp/issue_2199
closes https://github.com/assimp/assimp/issues/2199: introduce first …
2018-11-13 09:11:30 +01:00
Kim Kulling
b6af80f2fd closes https://github.com/assimp/assimp/issues/2199: introduce first version for exporter. 2018-11-12 22:26:10 +01:00
ruyo
c30c4ae6e2 glTF2 importer multiple primitives and 16-bit index buffer skinmesh support. 2018-11-11 14:27:11 +09:00
Kim Kulling
3fbe9095d1 Merge pull request #2211 from assimp/issue_2206
closes https://github.com/assimp/assimp/issues/2206: make bone error …
2018-11-09 15:36:02 +01:00
Kim Kulling
02c6b9b64b Merge branch 'master' into issue_2206 2018-11-09 13:13:52 +01:00
Kim Kulling
e787604ff1 Update ValidateDataStructure.cpp
Integrate review findings.
2018-11-09 11:54:12 +01:00
Kim Kulling
2d1f34f191 Merge pull request #2209 from daef/patch-2
delete[] doesnt set nullptr
2018-11-09 10:28:00 +01:00
Kim Kulling
850d57b39d closes https://github.com/assimp/assimp/issues/2206: make bone error in verification more verbose. 2018-11-08 22:12:05 +01:00
Kim Kulling
044c9b39e0 Merge branch 'master' into patch-2 2018-11-08 22:00:33 +01:00
Kim Kulling
bc99395491 Merge pull request #2208 from daef/patch-1
added DropFaceNormalsProcess to out vector
2018-11-08 21:59:37 +01:00
Kim Kulling
a4154a3fcc Merge branch 'master' into patch-1 2018-11-08 19:23:00 +01:00
Kim Kulling
131cfe2b1e Merge pull request #2207 from escherstair/clang_on_Windows
add clang to pushpack1.h
2018-11-08 19:22:14 +01:00
escherstair
deb9eb974b Update appveyor.yml 2018-11-08 13:40:04 +01:00