Commit Graph

9488 Commits (09520384618c4ab26c0c14a1016f6e95b4f05c3b)

Author SHA1 Message Date
Kim Kulling b842b4a3c1
Merge branch 'master' into fbxReportAssetIssuesProperly 2020-10-21 20:02:48 +02:00
Kim Kulling f13a69a817
Merge pull request #3470 from assimp/kimkulling-patch-7
Update FUNDING.yml
2020-10-21 17:04:36 +02:00
Kim Kulling f96698a6d2
Update FUNDING.yml 2020-10-21 16:39:19 +02:00
Kim Kulling 7c5f04deed
Merge pull request #3466 from assimp/collada_cleanup
Collada cleanup
2020-10-20 00:20:40 +02:00
Kim Kulling bbac168ced
Merge branch 'master' into collada_cleanup 2020-10-19 23:56:52 +02:00
Kim Kulling 69143ed149 fix unittests. 2020-10-19 23:53:27 +02:00
Kim Kulling 080322b9e2 cleanup collada xml migration. 2020-10-19 19:06:11 +02:00
Malcolm Tyrrell a2cd5619b4
Merge branch 'master' into readFbxWeightsInConfig 2020-10-19 10:16:02 +01:00
Kim Kulling 376e468877
Merge pull request #3231 from xiaozhuai/master
optimize CMakeLists.txt
2020-10-18 18:29:45 +02:00
john d48ac9d0a4 fix xcode compile bug 2020-10-18 10:54:04 +08:00
Kim Kulling 37c09ecb69
Update CMakeLists.txt 2020-10-17 10:58:06 +02:00
Kim Kulling 56e1a80e24
Merge branch 'master' into master 2020-10-17 10:57:26 +02:00
Kim Kulling fc11ca2f5e
Merge pull request #3461 from inhosens/dev_1016
glTF1's orthgraphic camera & glTF2's skinning
2020-10-17 10:56:38 +02:00
Inho Lee ad7f8910e9 Rollback the method to handle empty bones for GLTF2
A patch made the assimp to ignore empty bones.
However, some assets can have bones which don't have weights
but are connected to other bones.
2020-10-16 17:09:17 +02:00
Inho Lee 9f880e2214 Fix glTF1 orthographic camera 2020-10-16 08:56:55 +02:00
Kim Kulling c035177847
Merge pull request #3451 from xantares/patch-1
CMake: Fix FindRT warning
2020-10-15 20:08:35 +02:00
Malcolm Tyrrell 0363c18f1f Read weights 2020-10-15 10:07:24 +01:00
Silvio Traversaro 3b5212067c Fix CMake config generation
Use standard CMake function to generate the CMake config files.
2020-10-14 23:55:28 +02:00
Kim Kulling 76d370b054
Merge branch 'master' into patch-1 2020-10-14 22:05:56 +02:00
Kim Kulling dbd99bf700
Merge pull request #3456 from rbsheth/rbsheth_hunter_hotfix
Hotfix for Hunter builds
2020-10-14 22:05:34 +02:00
Kim Kulling 828068d224
Merge branch 'master' into rbsheth_hunter_hotfix 2020-10-14 21:14:42 +02:00
Kim Kulling f713d30e9b
Merge pull request #3454 from jsmaatta/master
Fix for issue #3445
2020-10-14 21:13:52 +02:00
Kim Kulling 7660070aa4
Merge branch 'master' into master 2020-10-14 21:01:35 +02:00
Kim Kulling b9f83c8db8
Merge pull request #3458 from assimp/issue_3449
Add handling for source for params
2020-10-14 20:57:08 +02:00
Kim Kulling 857f62cde0 closes pParam.mReference = source; 2020-10-14 20:34:46 +02:00
Rahul Sheth 4e57c1ee7f Hotfix for Hunter builds 2020-10-14 11:49:05 -04:00
Jukka Maatta 6848a18999 Fix for issue #3445
Add const to avoid creating a temporary copy.

This should fix the cmake compilation error on XGLLoader.cpp shown in bug #3445

The fix is similar to commit bbe6f7f213
2020-10-13 21:56:43 +03:00
Kim Kulling 84ef3dc0fc
Merge branch 'master' into fbxReportAssetIssuesProperly 2020-10-13 18:37:03 +02:00
Kim Kulling ba1145885d
Merge pull request #3452 from rbsheth/rbsheth_add_pugixml
Update Hunter for pugixml
2020-10-13 12:01:32 +02:00
Rahul Sheth b7c6719ed8 Fix test builds 2020-10-12 16:47:36 -04:00
Rahul Sheth f12e6eb6f4 Update Hunter for pugixml 2020-10-12 16:30:03 -04:00
xantares 22ea239049
CMake: Fix FindRT warning
This fixes the following warning:
The package name passed to `find_package_handle_standard_args` (rt) does                                                                                                                                                                   not match the name of the calling package (RT).
2020-10-12 10:42:41 +02:00
Kim Kulling 636f28965f
Merge branch 'master' into fbxReportAssetIssuesProperly 2020-10-11 18:13:43 +02:00
Kim Kulling 1df00143f5
Merge pull request #3446 from stromaster/patch-1
fix for fbx files using stingray materials;
2020-10-11 18:05:57 +02:00
Sahin Serdar Kocdemir eb9928e029
fix for fbx files using stringray materials; 2020-10-09 07:28:15 +01:00
Malcolm Tyrrell 20733537d7
Merge branch 'master' into fbxReportAssetIssuesProperly 2020-10-08 09:54:04 +01:00
Kim Kulling c7ab7ff457
Merge pull request #3413 from Optimizer0/master
[Bug-Fix] Fixed Strict Aliasing Level 3 Warnings
2020-10-08 10:17:32 +02:00
Optimizer0 1d3f8bd871
Merge branch 'master' into master 2020-10-06 15:48:11 +05:30
Kim Kulling 95d0443a5d
Merge pull request #3415 from assimp/issue_3379
closes https://github.com/assimp/assimp/issues/3379: reproduce error …
2020-10-06 10:38:09 +02:00
Optimizer0 152343b186
Merge branch 'master' into master 2020-10-06 08:35:26 +05:30
Kim Kulling d676e1a13f closes https://github.com/assimp/assimp/issues/3379: reproduce error of unresolved symbol with static lib 2020-10-05 21:37:18 +02:00
Kim Kulling 3b9d4cfd28
Merge pull request #2966 from assimp/pugi_xml
[WIP] Pugi xml
2020-10-05 20:02:51 +02:00
Kim Kulling 09a473ff02 fic tests. 2020-10-05 19:06:48 +02:00
Kim Kulling 52826a03f8 remove all hunter-dependencies for pugixml. 2020-10-05 18:53:42 +02:00
Kim Kulling 23f144a7b7 pugixml: use pugixml in headeronly mode. 2020-10-05 18:44:59 +02:00
Malcolm Tyrrell 4bdaf20b70 Add comment. 2020-10-05 14:23:42 +01:00
Isuru2000psn f2b3ec2e0c strict-aliasing level 3 warnings fix 2020-10-05 15:29:09 +05:30
Malcolm Tyrrell 585fb89154 Make an assert a DeadlyImportError. 2020-10-02 15:25:16 +01:00
Malcolm Tyrrell 57756750f6 Limit the output 2020-10-02 15:20:50 +01:00
Malcolm Tyrrell 17702605cf Limit the number of characters printed. 2020-10-02 14:41:36 +01:00