Commit Graph

6677 Commits (95d9c16a3b18ad3fcf28337766c518e4817a4aae)

Author SHA1 Message Date
Kim Kulling 50a95ad0f2
Merge branch 'master' into migenius-rsws52 2018-09-27 01:04:44 +02:00
Kim Kulling 6f260a4ed5
Merge pull request #2159 from assimp/issue_2154
closes https://github.com/assimp/assimp/issues/2154: remove redundant…
2018-09-27 00:01:44 +02:00
Kim Kulling 2dc572167c
Merge branch 'master' into issue_2154 2018-09-26 22:13:29 +02:00
Kim Kulling 4bb410d1d8
Merge pull request #2153 from assimp/kimmi_dev
INtroduce unittests.
2018-09-26 22:06:02 +02:00
Kim Kulling 35a727a3e4 closes https://github.com/assimp/assimp/issues/2154: remove redundant file from source folder. 2018-09-26 21:37:02 +02:00
Kim Kulling 74db0e906b Fix some minor findings. 2018-09-26 21:19:40 +02:00
Kim Kulling ea0f074933 Merge branch 'kimmi_dev' of https://github.com/assimp/assimp into kimmi_dev 2018-09-26 20:53:37 +02:00
Kim Kulling 9c8e6f2127 Fix overflow by face allocation. 2018-09-26 20:52:59 +02:00
Kim Kulling 5d091c4591
Merge branch 'master' into kimmi_dev 2018-09-26 19:15:58 +02:00
ardenpm 586c812eee
Merge pull request #5 from assimp/master
Merge commits from head master.
2018-09-26 15:44:41 +10:00
Kim Kulling 07362fdd35 Merge branch 'kimmi_dev' of https://github.com/assimp/assimp into kimmi_dev 2018-09-25 20:16:28 +02:00
Kim Kulling 6146ff818c Enable coveralls for export tests. 2018-09-25 20:15:48 +02:00
Kim Kulling 18879c0952
Merge pull request #2155 from aavenel/Fix2079
Fix #2079 Memory leak
2018-09-25 17:42:58 +02:00
Alexandre Avenel 504e5fd5c5 Use unique_ptr for gltf2 textures 2018-09-24 21:28:53 +02:00
Alexandre Avenel 673885a6d3 Add unit test for gltf2 export to obj 2018-09-24 19:10:54 +02:00
Kim Kulling 7d36c12dc4
Merge pull request #2150 from vjf/pyassimp_export_blob
Added interface to 'aiExportSceneToBlob()' for pyassimp
2018-09-23 18:13:45 +02:00
Kim Kulling bae96d76a3
Merge branch 'master' into pyassimp_export_blob 2018-09-22 19:08:23 +02:00
Kim Kulling b7bb38247f
Merge pull request #2152 from aavenel/ExposeEmbedTexture
Fix #2149 Add flag to embed textures in assimp_cmd
2018-09-22 19:06:44 +02:00
Kim Kulling 08561f875f
Merge branch 'master' into ExposeEmbedTexture 2018-09-22 17:51:17 +02:00
Kim Kulling 72aa49c54f
Merge branch 'master' into kimmi_dev 2018-09-22 15:52:22 +02:00
Kim Kulling 9f6238f3af INtroduce unittests. 2018-09-22 15:50:40 +02:00
Kim Kulling 7865f82082
Merge pull request #1863 from aoowweenn/umw_dev
Some fixes for MMD PMX file
2018-09-22 14:15:25 +02:00
Kim Kulling 56392cc02f
Update MMDPmxParser.cpp
Fix encoding for readstrings.
2018-09-22 12:50:23 +02:00
Kim Kulling d42f9a3226
Update MMDImporter.cpp
Reformattings
2018-09-22 12:46:38 +02:00
Kim Kulling 02c4b7f1bc
Merge branch 'master' into umw_dev 2018-09-22 10:24:09 +02:00
Kim Kulling 0b77ebbb3e
Merge pull request #1925 from wuxq/fix_gltf2_export_componentType_error
multi joint has bug  with ReplaceData
2018-09-22 10:22:45 +02:00
Kim Kulling cc0b3e1249
Merge branch 'master' into fix_gltf2_export_componentType_error 2018-09-22 07:54:10 +02:00
Alexandre Avenel b3e858956a Fix #2149 Add flag to embed textures in assimp_cmd 2018-09-21 22:17:12 +02:00
Kim Kulling d585030310
Merge pull request #2151 from assimp/kimmi_dev
Kimmi dev
2018-09-21 21:37:52 +02:00
Kim Kulling 24b42274fb
Update MDCFileData.h
Fix build by remove not supported initializer for array.
2018-09-21 20:13:35 +02:00
Kim Kulling 3a38c2c067
Update MDLFileData.h
Remove not supported array initialization.
2018-09-21 19:43:19 +02:00
Kim Kulling e129d88825
Update ASEParser.h
Fix not supported array initialization.
2018-09-21 19:26:41 +02:00
Kim Kulling 2017e50e7b
Update AMFImporter_Node.hpp
Fix invalid array initialization.
2018-09-21 18:59:47 +02:00
Kim Kulling abfc8fd048
Update texture.h
Fix array init for older compilers.
2018-09-21 18:51:45 +02:00
Kim Kulling 662f7086e3
Update types.h
Fix VS2013: array initialization does not work.
2018-09-21 18:46:30 +02:00
kimkulling f75bf6d99c MAke noexcept compiler-specific. 2018-09-21 16:25:27 +02:00
kimkulling bf1c002b5d Add missing file. 2018-09-21 16:09:24 +02:00
kimkulling b7e7c748ad Introduce COB-import test. 2018-09-21 16:07:43 +02:00
kimkulling f818a909e5 Fix static-code-analysis findings. 2018-09-21 16:07:09 +02:00
Vincent Fazio 8cb0b4ce2b Updated pyassimp function description 2018-09-21 11:02:14 +10:00
Vincent Fazio ef4e317625 Improved some comments 2018-09-21 10:51:38 +10:00
Vincent Fazio 3402cd81c7 Added interface to 'aiExportSceneToBlob()' for pyassimp 2018-09-21 10:31:21 +10:00
arkeon7 6cea62142c
Merge branch 'master' into Manage_PCloud_in_Filters 2018-09-20 10:34:55 +02:00
Arkeon 9eeaf19eab Allow findDegenerate and SplitLargeMesh to pass point clouds models.
Otherwise the model is removed or crash
2018-09-20 10:31:32 +02:00
Kim Kulling 0795ebda46
Merge pull request #2092 from assimp/kimkulling-build-instructions
Create Build.md
2018-09-20 00:22:08 +02:00
Kim Kulling 62416122d4
Merge branch 'master' into kimkulling-build-instructions 2018-09-18 20:40:56 +02:00
Kim Kulling a4aa7e45ef
Merge pull request #2143 from turol/strict-aliasing
Disable strict aliasing optimization
2018-09-18 20:40:32 +02:00
Kim Kulling 0a1cffc1fb
Merge branch 'master' into strict-aliasing 2018-09-18 18:45:35 +02:00
Kim Kulling 14a5b4854e
Merge pull request #2141 from vjf/pyassimp-update2
Updated all of struct.py to be in sync with assimp header files
2018-09-18 18:45:12 +02:00
Turo Lamminen 78fe96f8c4 Prepend our compiler flags instead of appending so overriding them works better 2018-09-18 11:08:01 +03:00