Commit Graph

5077 Commits

Author SHA1 Message Date
Kim Kulling
206f28b8ad Merge branch 'master' into fix/3365 2020-10-29 13:40:00 +01:00
Kim Kulling
72bc41b50f Merge branch 'master' into fix/xcode-compile-20201018 2020-10-28 22:00:08 +01:00
Kim Kulling
8c135f779e Merge branch 'master' into readFbxWeightsInConfig 2020-10-28 20:38:29 +01:00
Kim Kulling
3fd95aff4e Merge branch 'master' into fix/3365 2020-10-27 17:43:28 +01:00
Kim Kulling
df768bdd99 Merge branch 'master' into patch-1 2020-10-27 16:20:33 +01:00
Kim Kulling
7e1a8f09c5 more openddl-fixes 2020-10-26 21:35:44 +01:00
Kim Kulling
aee2e9a87d Merge branch 'master' into patch-1 2020-10-25 20:35:06 +01:00
Kim Kulling
57e691e28e openddl: latest greatest. 2020-10-25 10:34:43 +01:00
Kim Kulling
55feb0cb78 Merge branch 'master' into fix/xcode-compile-20201018 2020-10-23 22:06:49 +02:00
Max Vollmer
4006bb71f4 Fixes for crashes in GLTF2 Importer 2020-10-23 12:01:43 +01:00
John Mai
cea54d1ac5 Merge branch 'master' into fix/xcode-compile-20201018 2020-10-23 14:06:25 +08:00
Kim Kulling
6ee5e248ee Fix typo 2020-10-22 22:26:29 +02:00
#Momo
b168d8f441 replaced data with taking address of first element
oops, seems like `data()` returns `char*` only since C++17. Replaced with taking address of first string element
2020-10-21 23:41:33 +03:00
#Momo
7781fe5781 MSVC crash workaround
I do not know why, but the following line causes crash if assimp was compiled using MSVC with RelWithDebInfo configuration:
`std::transform(shading.begin(), shading.end(), shading.begin(), Assimp::ToLower<char>);`
replacing `shading.begin()` with `shading.data()` fixes this issue.
2020-10-21 23:21:50 +03:00
Kim Kulling
b842b4a3c1 Merge branch 'master' into fbxReportAssetIssuesProperly 2020-10-21 20:02:48 +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
john
d48ac9d0a4 fix xcode compile bug 2020-10-18 10:54:04 +08: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
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
7660070aa4 Merge branch 'master' into master 2020-10-14 21:01:35 +02:00
Kim Kulling
857f62cde0 closes pParam.mReference = source; 2020-10-14 20:34:46 +02: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
Rahul Sheth
f12e6eb6f4 Update Hunter for pugixml 2020-10-12 16:30:03 -04:00
Kim Kulling
636f28965f Merge branch 'master' into fbxReportAssetIssuesProperly 2020-10-11 18:13:43 +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
Optimizer0
152343b186 Merge branch 'master' into master 2020-10-06 08:35:26 +05:30
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
6b9c477763 The floar parsing routines are now DeadlyErrors. 2020-10-02 13:58:55 +01:00
kimkulling
b6dde74155 adaptions to support hunter 2020-10-01 16:35:34 +02:00
kimkulling
d75fa2bb4b fix invalid path. 2020-10-01 10:43:48 +02:00
kimkulling
c740f61f97 hunter integration: pugixml 2020-10-01 10:29:52 +02:00
Kim Kulling
c7f7ed8901 Update ColladaLoader.cpp 2020-09-30 20:51:54 +02:00
Kim Kulling
0191c661b5 fix division by zero. 2020-09-30 20:39:26 +02:00
Kim Kulling
177426185e Fix invalid cast 2020-09-30 16:38:13 +02:00
Kim Kulling
50d21e08f3 fix memoy leak. 2020-09-30 12:05:32 +02:00
Kim Kulling
788099a223 Merge branch 'master' into pugi_xml 2020-09-29 21:29:37 +02:00
Kim Kulling
c591f7de2f make xml parsing more verbose. 2020-09-29 21:01:10 +02:00
Kim Kulling
db49a541c3 remove unused attributes. 2020-09-28 20:35:30 +02:00
Kim Kulling
ef9a78b49d remove unused attributes. 2020-09-28 20:34:44 +02:00