Commit Graph

1607 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Kim Kulling
bf4ad2837f Remove dead code. 2020-09-28 15:20:59 +02:00
Kim Kulling
c598a12340 Remove unused variable. 2020-09-28 09:15:56 +02:00
Kim Kulling
89ac168014 ogre: fix warning: not inited variable. 2020-09-27 21:23:55 +02:00
Kim Kulling
1c85676a9c collada: fix warning: not inited variable. 2020-09-27 21:19:23 +02:00
Kim Kulling
052cc2e070 collada: fix warning: not inited variable. 2020-09-27 21:16:51 +02:00
Kim Kulling
5038f21d06 collada: fix warning: not inited variable. 2020-09-27 21:14:21 +02:00
Kim Kulling
202907d471 collada: fix warning: unused variable. 2020-09-27 21:11:42 +02:00
Kim Kulling
3f97a1df2c collada: fix warning: unused variable. 2020-09-27 21:09:06 +02:00
Kim Kulling
bdd3c96eee amf: fix warning: unused variable. 2020-09-27 21:06:14 +02:00
Kim Kulling
5877f81419 amf: fix warning: unused variable. 2020-09-27 21:03:59 +02:00
Kim Kulling
5230b91611 amf: fix warning: unused variable. 2020-09-27 21:01:48 +02:00
Kim Kulling
8143ea5aec amf: fix warning: unused variable. 2020-09-27 20:58:08 +02:00
Kim Kulling
9a19a4723b amf: fix warning: unused variable. 2020-09-27 20:54:21 +02:00
Kim Kulling
5653a82a87 fix the unittests. 2020-09-27 20:20:44 +02:00
Kim Kulling
9234fee35e Ogre: fix xml migration. 2020-09-27 09:36:38 +02:00
Sherief Farouk
a3c8cfc0ff Fix for build break due to warnings-as-errors when not building M3D exporter. 2020-09-26 23:21:23 -07:00
Kim Kulling
d6892b3f58 Merge branch 'master' into pugi_xml 2020-09-25 21:00:09 +02:00
Kim Kulling
557273818d collada: next iteration. 2020-09-23 21:23:12 +02:00
Kim Kulling
34351b3cb9 fix collada material parsing. 2020-09-23 00:20:06 +02:00
Kim Kulling
c0e58c1895 Merge branch 'master' into gltfBufferViewSizeFix 2020-09-22 20:02:16 +02:00
kimkulling
71f20eaa8a next fixes 2020-09-22 15:51:21 +02:00
kimkulling
dee8e5bee1 Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml 2020-09-22 15:20:35 +02:00
Kim Kulling
c4039d5cf0 fix collada data parsing. 2020-09-21 20:05:16 +02:00