Commit Graph

6060 Commits (224b43a3a9c8993c0ca96b1189ba91d968fe4e5d)

Author SHA1 Message Date
Kim Kulling a1c1ad74bd
Merge pull request #1582 from mrautio/master
Add support for building Mac OS X Framework bundles
2017-11-23 13:31:00 +01:00
Giuseppe Barbieri fdb52723c4
Update Readme.md 2017-11-22 16:11:46 +01:00
Kim Kulling d180cfcba5
Merge branch 'master' into master 2017-11-22 16:01:16 +01:00
Kim Kulling ed4e6b0db0
Merge pull request #1580 from assimp/scene_combiner_crash
check for nullptr dereferencing before copying scene data
2017-11-22 16:00:46 +01:00
Kim Kulling e35f789ace
Merge branch 'master' into scene_combiner_crash 2017-11-22 13:46:14 +01:00
Kim Kulling ac37977230
Merge pull request #1575 from elect86/patch-12
Update ValidateDataStructure.h, typo
2017-11-22 13:30:07 +01:00
Kim Kulling 454b8919b0 use one header for all xml-tags. 2017-11-21 21:34:25 +01:00
Kim Kulling 6da4258206
Merge branch 'master' into patch-12 2017-11-21 20:03:09 +01:00
Kim Kulling a2ba3d630d
Merge pull request #1586 from turol/validate
Enable data structure validation in cases where it doesn't cause failures
2017-11-21 20:02:28 +01:00
Kim Kulling b474e75e29 3Mf-Export: add prototypes for relations and rest of 3MF-document. 2017-11-21 18:41:16 +01:00
Turo Lamminen 127705d347 Unit tests: Enable data structure validation in cases where it doesn't cause failures 2017-11-21 18:04:22 +02:00
Kim Kulling a7be5b527f add missing return statement. 2017-11-20 23:53:53 +01:00
Kim Kulling 9ca7b00280 Merge branch 'master' into export_3mf 2017-11-20 22:36:50 +01:00
Kim Kulling c22b4acd47 3MF: Export initial commit. 2017-11-20 22:36:17 +01:00
Kim Kulling 70d9df868d
Merge branch 'master' into patch-12 2017-11-20 22:23:47 +01:00
Kim Kulling 4cf8e10235
Merge pull request #1585 from pdaehne/master
[glTF2] Moved byteStride from accessor to bufferView
2017-11-20 22:19:22 +01:00
Kim Kulling ba3acd7459
Merge branch 'master' into patch-12 2017-11-20 19:56:14 +01:00
Patrick Dähne a05d74a281 [glTF2] Moved byteStride from accessor to bufferView 2017-11-20 19:01:28 +01:00
Kim Kulling beff88228d
Merge branch 'master' into master 2017-11-20 18:56:10 +01:00
Kim Kulling 4502d72ee6
Merge pull request #1584 from pdaehne/master
[glTF2] Implemented reading binary glTF2 (glb) files
2017-11-20 18:55:30 +01:00
Patrick Dähne 6cbfd5b977 [glTF2] Implemented reading binary glTF2 (glb) files 2017-11-20 14:59:05 +01:00
Mika Rautio 9f1dce8e57
Merge branch 'master' into master 2017-11-20 10:27:11 +02:00
Mika Rautio 4fb5038fb1 Add support for building Mac OS X Framework bundles 2017-11-20 00:10:05 +02:00
Kim Kulling 2a9f79f958 check for 0 properties before copy them 2017-11-19 19:05:51 +01:00
Kim Kulling 55c9761228
Merge branch 'master' into patch-12 2017-11-19 18:25:22 +01:00
Kim Kulling 9707fde709 check for nullptr dereferencing before copying scene data 2017-11-19 17:41:31 +01:00
Kim Kulling e1837b6cc8
Merge pull request #1576 from elect86/patch-13
Update ValidateDataStructure.h, typo
2017-11-19 17:38:02 +01:00
Kim Kulling 65d6daa414
Merge branch 'master' into patch-13 2017-11-18 20:36:05 +01:00
Kim Kulling b408e25a1d
Merge pull request #1579 from assimp/fix_android
Fix android
2017-11-18 20:35:54 +01:00
Kim Kulling 1a1d96d3e2 Merge branch 'master' into fix_android 2017-11-18 18:32:58 +01:00
Kim Kulling a8e65a1e8a Fix android build. 2017-11-18 18:32:16 +01:00
turol 864a080b45
Merge pull request #1578 from turol/warnings
Fix miscellaneous warnings
2017-11-18 18:45:19 +02:00
Turo Lamminen 8ae7231654 Blender: Silence warning about uninitialized member 2017-11-18 16:50:45 +02:00
Turo Lamminen 2c8cc1f732 BlenderDNA: Silence warning about uninitialized member 2017-11-18 16:49:03 +02:00
Turo Lamminen bcffa28a33 MDLImporter: Don't take address of packed struct member 2017-11-18 16:39:43 +02:00
Turo Lamminen 10f4b6f95c assimp_cmd: Fix strict-aliasing warnings 2017-11-18 16:02:53 +02:00
Turo Lamminen 53119e74f8 Open3DGC: Fix strict-aliasing warnings 2017-11-18 15:59:30 +02:00
Turo Lamminen 1067ae4bfa FIReader: Fix strict-aliasing warnings 2017-11-18 15:54:40 +02:00
Turo Lamminen c1515db56f Blender: Fix strict-aliasing warnings 2017-11-18 15:50:56 +02:00
Turo Lamminen 40bb3f3d0f Unit test: Fix signed/unsigned comparison warnings 2017-11-18 15:32:42 +02:00
Kim Kulling 3e78bd51d4
Merge pull request #1577 from elect86/patch-14
Update ValidateDataStructure.cpp, typo
2017-11-18 09:14:47 +01:00
Giuseppe Barbieri 703d046fd9
Update ValidateDataStructure.cpp 2017-11-18 00:34:00 +01:00
Giuseppe Barbieri fc360b9cc8
Update ValidateDataStructure.h 2017-11-18 00:05:17 +01:00
Giuseppe Barbieri b428c66f39
Update ValidateDataStructure.h 2017-11-17 23:10:05 +01:00
Kim Kulling fb9a5950fd
Merge pull request #1569 from assimp/issue_1513
[WIP]: closes https://github.com/assimp/assimp/issues/1513: fix assimp for c…
2017-11-16 18:20:05 +01:00
Kim Kulling 07a99e0843
Merge branch 'master' into issue_1513 2017-11-16 17:32:34 +01:00
Kim Kulling fae198ebfe
Merge pull request #1572 from elect86/patch-11
Update Importer.cpp
2017-11-16 17:32:02 +01:00
Giuseppe Barbieri d9965f6220
Update Importer.cpp 2017-11-16 14:42:20 +01:00
Kim Kulling 98da53e66a
Merge pull request #1498 from turol/analyze
Add static analysis to Travis build
2017-11-15 21:28:59 +01:00
Kim Kulling 7db10022e9 closes https://github.com/assimp/assimp/issues/1513: fix assimp for cross compile for android 2017-11-15 21:26:25 +01:00