Commit Graph

11226 Commits (be700a04806b1bd296945b2dda0234d37dece962)

Author SHA1 Message Date
Kim Kulling 790203ee9d
Merge branch 'master' into improve-msvc-switches 2021-06-07 21:21:20 +02:00
Kim Kulling cdc1bf8e10
Merge pull request #3916 from jagoon/fix-fbx-exporter2
Fix fbx exporter bug if root node contains meshes.
2021-06-07 21:20:18 +02:00
Scott Baldric 8039351a67
Merge branch 'master' into Fix_SceneCombiner_Texture_Reindexing 2021-06-07 11:44:10 -05:00
Kim Kulling a8ddc74426
Merge branch 'master' into fix-fbx-exporter2 2021-06-07 18:26:59 +02:00
Kim Kulling 1126fa5218
Merge pull request #3934 from assimp/fix_dxf_viewer
fix viewer in case of unknown primitives.
2021-06-07 18:24:52 +02:00
Kim Kulling d33cf1dc0c
Merge branch 'master' into x3d_pugi_migration 2021-06-06 16:06:08 +02:00
Scott Baldric 444fc9c373 Increasing length of mDataLength if rewriting the texture index increases magnitutde of index. 2021-06-04 16:32:46 -05:00
Kim Kulling 84db4d3a08
Update CMakeLists.txt 2021-06-03 23:56:52 +02:00
Kim Kulling b0e7271449
Merge branch 'master' into stb-image-updated 2021-06-03 23:46:43 +02:00
Kim Kulling e6b83feb9f
Update CMakeLists.txt 2021-06-03 23:45:48 +02:00
Kim Kulling 1a493613c1
Merge branch 'master' into fix_dxf_viewer 2021-06-03 23:43:39 +02:00
Kim Kulling a3b3ab1d44
Merge pull request #3941 from assimp/issue_3767
update pugi_xml to 1.11
2021-06-03 23:42:08 +02:00
Kim Kulling 742250c5fb
Update CMakeLists.txt 2021-06-03 23:42:07 +02:00
Kim Kulling a716f741d8
fix the include 2021-06-03 23:35:12 +02:00
Kim Kulling bf0f8d4c1b
Update pugiconfig.hpp 2021-06-03 23:29:53 +02:00
Kim Kulling cc912f09f7 update pugi_xml to 1.11 2021-06-03 23:16:20 +02:00
Kim Kulling 22b49efbd0
Merge branch 'master' into stb-image-updated 2021-06-03 23:07:48 +02:00
Kim Kulling d2da600d08
Merge pull request #3940 from assimp/kimkulling-issue_3887
Use correct attribute name
2021-06-03 23:07:40 +02:00
Kim Kulling e0d1a36523
Merge branch 'master' into stb-image-updated 2021-06-03 23:07:38 +02:00
Kim Kulling b4fc41bc09
Use corret attribute name
- closes https://github.com/assimp/assimp/issues/3887
2021-06-03 22:52:10 +02:00
Kim Kulling d600b45cd2 Merge branch 'x3d_pugi_migration' of https://github.com/assimp/assimp into x3d_pugi_migration 2021-06-03 22:21:10 +02:00
Kim Kulling f28331b202
Merge pull request #3939 from assimp/kimkulling-issue_3872
Update unity plugin to trilib2
2021-06-03 20:58:21 +02:00
Kim Kulling 3a32612b71 Add skipping of unused nodes. 2021-06-03 20:55:31 +02:00
Kim Kulling 84a2e1fc92
Update unity plugin to trilib2
- closes https://github.com/assimp/assimp/issues/3872
2021-06-03 20:43:37 +02:00
Kim Kulling c8510a1a82
Merge branch 'master' into fix-fbx-exporter2 2021-06-03 11:05:07 +02:00
Kim Kulling d4199ee968
Merge pull request #3903 from ogjamesfranco/cached_output_directory_vars
Change the Assimp output directory vars to cached vars
2021-06-03 10:47:15 +02:00
Kim Kulling dd3d03a4ae
Merge branch 'master' into cached_output_directory_vars 2021-06-03 10:31:57 +02:00
Kim Kulling 35c506fcf8
Merge branch 'master' into fix_dxf_viewer 2021-05-30 21:56:15 +02:00
Kim Kulling 77ce4080b6 fix viewer in case of unknown primitives. 2021-05-30 21:54:04 +02:00
Garux 3b565444c3 Merge branch 'Q1MDLgroup' of https://github.com/Garux/assimp into Q1MDLgroup 2021-05-30 11:55:45 +03:00
Garux c776924adf fix -Waddress-of-packed-member 2021-05-30 11:45:50 +03:00
Kim Kulling c04759ccc4
Merge pull request #3922 from Evangel63/master
Fix bug in aiMetadata constructor that overwrites an array of one of …
2021-05-29 16:06:43 +02:00
Kim Kulling 8f18820bb2
Merge branch 'master' into master 2021-05-29 15:47:24 +02:00
Kim Kulling 9be76c1ba5
Merge pull request #3929 from TinyTinni/issue_3711
Fix non skipped CR in header parsing for binary PLY
2021-05-29 09:29:16 +02:00
Kim Kulling 09bb79c68a
Merge branch 'master' into issue_3711 2021-05-29 08:39:18 +02:00
Matthias Möller 7534b149cf fix non skipped CR in header parsing 2021-05-28 15:28:35 +02:00
Kim Kulling 1f6fe4b5ad
Merge pull request #3927 from assimp/kimkulling-update-fr-template
Update feature_request.md
2021-05-28 10:51:07 +02:00
Kim Kulling 2559befaca
Update feature_request.md
- Add label Feature-Request
2021-05-28 10:26:03 +02:00
Kim Kulling c6c7e84c00
Merge pull request #3926 from assimp/kimkulling-update-bug_template
Update bug_report.md
2021-05-28 09:49:00 +02:00
Kim Kulling 3c51ff771c
Update bug_report.md
- Add the bug label
- Make platform config more easy
2021-05-28 09:34:03 +02:00
Kim Kulling 2b8a06340c
Merge pull request #3925 from assimp/kimkulling-tectdebt_add_label
Update tech_debt.md
2021-05-28 09:32:10 +02:00
Kim Kulling 919ae69fe8
Update tech_debt.md 2021-05-28 08:44:40 +02:00
Kim Kulling eadffe8e3a
Merge pull request #3923 from assimp/kimkulling-tech_debt_template
Create tech_debt.md
2021-05-27 17:54:03 +02:00
Kim Kulling 59467b204a
Create tech_debt.md 2021-05-27 15:50:28 +02:00
Kim Kulling 15bdc09863
Merge pull request #3917 from Nodrev/fix-gcc4.9-compilation
Fix gcc4.9 compilation
2021-05-27 15:46:22 +02:00
Kim Kulling 70cc1630fa
Merge branch 'master' into fix-gcc4.9-compilation 2021-05-27 15:25:01 +02:00
Kim Kulling 57b1040a0c
Merge pull request #3894 from crud89/master
Add export property to control blob names.
2021-05-27 15:16:01 +02:00
Kim Kulling 48e99d2e0a
Merge branch 'master' into master 2021-05-27 10:45:36 +02:00
Kim Kulling 64d5f21627
Merge pull request #3912 from dlyr/fix-fov-doc
Fix camera fov comment since full fov is stored
2021-05-27 10:41:01 +02:00
Kim Kulling 7258441153
Merge branch 'master' into fix-fov-doc 2021-05-27 10:26:20 +02:00