Commit Graph

6854 Commits (99c3697d1230dbff354f2507174f76444f4738f0)

Author SHA1 Message Date
Kim Kulling f8d8a43a35
Merge pull request #2172 from matt77hias/C4267
Fix: C4267 conversion warning
2018-10-08 20:33:17 +02:00
Kim Kulling e1247e81e1
Update utglTF2ImportExport.cpp
Check scene pointer against nullptr.
2018-10-08 14:53:33 +02:00
Kim Kulling 871e1524e4
Update IFCLoader.cpp
Remove dead code.
2018-10-08 14:51:50 +02:00
Kim Kulling 931ef2cd0b StepFile: fix conversion from ulong to uint. 2018-10-07 21:15:09 +02:00
Kim Kulling 2e443dc669
Merge branch 'master' into C4267 2018-10-07 20:31:41 +02:00
Kim Kulling 65c07613ea
Merge pull request #2174 from Wasabi375/patch-1
ReadFieldPtrVector should return true when successful
2018-10-07 20:31:10 +02:00
Kim Kulling 92f69affd9 StepFile: Working parser. 2018-10-07 19:22:13 +02:00
Burkhard Mittelbach afbdb043b0
ReadFieldPtrVector should return true when successful 2018-10-07 19:11:34 +02:00
Kim Kulling 4c5c172ee2
Merge branch 'master' into C4267 2018-10-07 18:16:44 +02:00
Kim Kulling 3ac4494393
Merge pull request #2173 from Gargaj/patch-1
Fix Blender FOV loading (fixes #1854)
2018-10-07 18:16:16 +02:00
Kim Kulling e84ccaea15 Merge branch 'master' into step-import 2018-10-07 16:22:32 +02:00
Gargaj 16bdac5c9e
Merge branch 'master' into patch-1 2018-10-07 16:04:11 +02:00
Kim Kulling 07e22fd3fc
Merge pull request #2171 from matt77hias/C4244
Fix: C4244 conversion warning
2018-10-07 15:56:53 +02:00
Gargaj 6af016d149
Fix Blender FOV loading 2018-10-07 15:34:44 +02:00
Kim Kulling c355412348
Merge branch 'master' into C4244 2018-10-07 14:29:39 +02:00
Kim Kulling e45e4dc736
Merge pull request #2170 from matt77hias/patch-1
Refactored "../Include/" includes
2018-10-07 01:38:30 +02:00
Matthias Moulin be9ed7a8d3
Merge branch 'master' into C4267 2018-10-06 22:17:56 +02:00
Matthias Moulin 0d14cdea2d
Merge branch 'master' into C4244 2018-10-06 22:17:33 +02:00
Kim Kulling 5d58c3a0d5
Merge branch 'master' into patch-1 2018-10-06 21:38:06 +02:00
Kim Kulling 97cca1562a
Merge pull request #2169 from assimp/kimkulling-patch-2
Update Build.md
2018-10-06 20:56:11 +02:00
Matthias Moulin c90eda983d
Fix: C4267 2018-10-06 16:31:58 +02:00
Matthias Moulin b4425d8e36
Fix: C4267 2018-10-06 16:30:38 +02:00
Matthias Moulin e7da1c634d
Fix: C4244 conversion warning 2018-10-06 16:28:10 +02:00
Matthias Moulin 239c59d715
Fixed include: IFCReaderGen_4 instead of IFCReaderGen4 2018-10-06 16:12:58 +02:00
Matthias Moulin 716205fde0
Replaced "../Include/" include from irrXMLWrapper.h 2018-10-06 15:22:10 +02:00
Matthias Moulin 88c173a6f4
Replaced "../Include/" include from glTFAsset.h 2018-10-06 15:20:28 +02:00
Matthias Moulin 47fcbfd369
Replaced "../Include/" include from glTF2Asset.h 2018-10-06 15:19:56 +02:00
Matthias Moulin 7061493ead
Replaced "../Include/" include from HMPFileData.h 2018-10-06 15:16:40 +02:00
Matthias Moulin d7bcd58174
Replaced "../Include/" include from MD4FileData.h 2018-10-06 15:15:43 +02:00
Matthias Moulin 8bb4b57d1d
Replaced "../Include/" include from HMPFileData.h 2018-10-06 15:11:47 +02:00
Matthias Moulin 91a805a082
Update HalfLifeFileData.h 2018-10-06 15:05:18 +02:00
Matthias Moulin 463a7e8016
Replaced "../Include/" include from MD3FileData.h 2018-10-06 15:02:58 +02:00
Matthias Moulin 99fc989af7
Replaced "../Include/" include from MDLFileData.h 2018-10-06 15:01:42 +02:00
Matthias Moulin d9a7ed19a8
Replaced "../Include/" include from 3DSHelper.h 2018-10-06 14:59:20 +02:00
Matthias Moulin 531f30302f
Replaced "../Include/" include from 3DSHelper.h 2018-10-06 14:58:06 +02:00
Matthias Moulin d4b0cd53ea
Replaced "../Include/" include from FBXDocumentUtil.h 2018-10-06 14:55:20 +02:00
Kim Kulling f4b1d0bc3c
Update Readme.md
Add link to readme.
2018-10-06 13:45:09 +02:00
Kim Kulling a238c5c4b4
Update Build.md
Prototype for build-doc.
2018-10-06 13:18:14 +02:00
Kim Kulling 619e09fbec Stepfile: separate generated code. 2018-10-06 08:45:55 +02:00
Kim Kulling 85b9e36c2d
Merge pull request #2168 from assimp/issue_2067
closes https://github.com/assimp/assimp/issues/2067: introduce /bigo…
2018-10-06 08:34:58 +02:00
Kim Kulling d1f7472242
Update CMakeLists.txt 2018-10-05 21:28:07 +02:00
Kim Kulling 3cf5fbb945
Update CMakeLists.txt
Fix the switches.
2018-10-05 20:45:41 +02:00
Kim Kulling f588568c53 closes https://github.com/assimp/assimp/issues/2067: introduce /bigobj compiler flag 2018-10-05 20:20:16 +02:00
Kim Kulling e6b9c8e2a6
Merge pull request #2167 from Starnick/patch-1
Update AssimpNet redirect
2018-10-05 19:59:06 +02:00
Kim Kulling 106b139ef3 Stepfile: renaming first generated code. 2018-10-05 19:42:26 +02:00
Kim Kulling aceaecaed7 StepFile: introduce generated parser code. 2018-10-05 19:41:52 +02:00
Nicholas Woodfield dfc38b5e9a
Update AssimpNet redirect
After the exchange on twitter, I noticed that this readme never actually had a link pointing to the bitbucket repository that I maintain (originally the googlecode one, and then a fork of the googlecode one I didn't know about).

This is very confusing for people who report issues, and I would like them to make sure they can report on a tracker that I keep tabs on.
2018-10-05 11:34:03 -04:00
Kim Kulling 5ebf81ad3c
Merge pull request #2161 from dormon/master
Improved cmake configs for Windows and Linux.
2018-10-04 19:42:53 +02:00
Kim Kulling aab796bc1c
Merge branch 'master' into master 2018-10-02 01:13:13 +02:00
Kim Kulling 382f5fde5f
Merge pull request #2162 from gongminmin/IgnoreHash
Add IGNORE_GIT_HASH.
2018-10-02 01:12:30 +02:00