Commit Graph

8749 Commits (2571b47a28162049e748e36b21bd79081c0c202c)

Author SHA1 Message Date
bzt 5a79287041 More reduced scope fix, what's wrong with reusing i as a loop variable? 2019-10-30 01:21:15 +01:00
bzt 7ed621b53f More reduced scope fix by wasting more memory... 2019-10-30 01:14:20 +01:00
bzt 1c23d2e8de More reduced scope fix by wasting more memory... 2019-10-30 01:11:34 +01:00
bzt 5b18baf883 Fixed issues with MSVC 2019-10-30 00:55:54 +01:00
RevoluPowered 02a63f8b10 Fixed template being used in file 2019-10-29 20:21:16 +00:00
Kim Kulling be09110aa8
Merge branch 'master' into feature/easy-armature-lookup 2019-10-29 21:09:50 +01:00
Kim Kulling 6432fc8168
Merge pull request #2726 from quanterion/fix-3ds-material-names
Fix lower casing material names in 3DS importer
2019-10-29 21:06:15 +01:00
bzt a622e109a0 Fixed PR Quality Review Issues 2019-10-29 18:42:10 +01:00
bzt 0baec5f0bd Added M3D format support 2019-10-29 14:14:00 +01:00
Kim Kulling 459d8105a7
Merge branch 'master' into fix-3ds-material-names 2019-10-29 13:18:23 +01:00
Kim Kulling 15dcd5c096
Merge pull request #2725 from migenius/migenius-fix-pbrsg
glTF2 fix glossinessFactor being put into the wrong object on export
2019-10-29 12:57:23 +01:00
Kim Kulling 18555abed0
Merge branch 'master' into migenius-fix-pbrsg 2019-10-28 20:08:47 +01:00
Kim Kulling 2ed0d905ab
Merge pull request #2717 from migenius/migenius-fix-doublefree
Fix multiple deallocation of memory for texture data.
2019-10-28 20:00:05 +01:00
Kim Kulling 571d64e3c1
Merge branch 'master' into migenius-fix-doublefree 2019-10-28 07:51:19 +01:00
Kim Kulling 562ad9dc99
Merge pull request #2711 from RichardTea/collada_zae_textures_2710
Collada ZAE texture loading
2019-10-28 07:50:41 +01:00
Kim Kulling 61ea5a4ac6
Merge branch 'master' into collada_zae_textures_2710 2019-10-27 18:24:16 +01:00
Kim Kulling 3255f1ad17
Merge pull request #2709 from RichardTea/assimp_version_2693
Update assimp legal and version
2019-10-27 18:23:27 +01:00
RevoluPowered d7d79db0ac Tests should always debug log 2019-10-27 14:17:37 +00:00
RevoluPowered 5155efe888 Fixed bitmask issue
We are approaching the limit for the number of post processes
2019-10-27 14:16:39 +00:00
RevoluPowered a9a0d4d29b Tidying order of function calls and fixed debug statements 2019-10-27 14:16:39 +00:00
RevoluPowered 212bcfe75c Test disable cache 2019-10-27 14:16:39 +00:00
RevoluPowered 9c8d835704 Explicitly use nullptr 2019-10-27 14:16:39 +00:00
RevoluPowered 5d0c63391b Explicitly set the size of the parent node if we have no children 2019-10-27 14:16:39 +00:00
RevoluPowered a30936954e Best to check the number of children before checking the actual array 2019-10-27 14:16:39 +00:00
RevoluPowered 514257f587 Added unit tests for ArmaturePopulate when used (added huestos model to tests)
Added clear documentation for this too to explain, you need to enable it to make it available

Signed-off-by: RevoluPowered <gordon@gordonite.tech>
2019-10-27 14:16:39 +00:00
RevoluPowered 46cdd81d75 Added ArmaturePopulate scale process for all formats 2019-10-27 14:16:39 +00:00
RevoluPowered 93efe4197a Removed redundant rest matrix and fixed assert compile error 2019-10-27 14:16:39 +00:00
RevoluPowered 6ea97a1282 Updated test cases to test import of names
This now doesn't overwrite names anymore as this would cause nasty bugs application side.

We can now support these by default without having to handle them as edge cases.
2019-10-27 14:16:39 +00:00
RevoluPowered 168ae22ad4 Implemented easy armature lookup
This lets you directly retrieve the node a bone links to and informs you of the armature directly

This also fixes a bug with bone name being made unique which causes them to become not 1:1 what the modeller has imported.
2019-10-27 14:16:39 +00:00
Kim Kulling 120e97e55b
Merge branch 'master' into assimp_version_2693 2019-10-27 13:47:59 +01:00
Kim Kulling 29f7ea0235
Merge pull request #2698 from Zalewa/mingw-fix-2685
Fix #2685 - library compiled by MinGW is unusable in MinGW.
2019-10-27 13:47:24 +01:00
Kim Kulling b8321925c3
Merge branch 'master' into mingw-fix-2685 2019-10-27 10:43:00 +01:00
Kim Kulling e63123de75
Merge pull request #2697 from ffontaine/master
Fix FBXConverter: use proper 64-bit constant
2019-10-27 10:42:33 +01:00
Kim Kulling 93d87c775d
Merge branch 'master' into master 2019-10-27 09:00:47 +01:00
Kim Kulling 3bfd06483e
Merge pull request #2723 from assimp/kimkulling-patch-1
Update appveyor.yml
2019-10-25 17:15:09 +02:00
RevoluPowered b5f659c98d Added clang format 2019-10-25 15:01:58 +01:00
RevoluPowered 5baff40edc Git ignore 2019-10-25 15:01:58 +01:00
Raphael Dümig 2d086fd236 ColladaParser: fix handling of empty XML-elements 2019-10-25 15:23:13 +02:00
Rem 5f58ef82b9 prevent accidental lower casing material names in ReplaceDefaultMaterial 2019-10-25 10:18:27 +03:00
Paul Arden cbd4e8bc22 Fix inconsistent indentation in previous commit. 2019-10-25 12:19:28 +11:00
Paul Arden 822be33408 Move pbrSG glossinessFactor into the correct material extension object. Fixes issue #2724. 2019-10-25 12:17:43 +11:00
ardenpm fa8ab3b1e7
Merge pull request #9 from assimp/master
Update master from assimp
2019-10-25 11:55:13 +11:00
Kim Kulling 7abc551b47
Merge branch 'master' into kimkulling-patch-1 2019-10-24 20:22:32 +02:00
Kim Kulling 41ab019cbf
Update appveyor.yml
Add missing cmake build target.
2019-10-23 22:42:19 +02:00
Kim Kulling bd25cc7c8f
Merge pull request #2704 from MalcolmTyrrell/fix-gltf-importer-crash
Fix gltf importer crash
2019-10-23 22:39:12 +02:00
Kim Kulling 932acf4350
Merge branch 'master' into fix-gltf-importer-crash 2019-10-23 20:14:38 +02:00
Kim Kulling 31e885a47a
Update appveyor.yml
Reenable VS2013
2019-10-22 20:24:23 +02:00
Kim Kulling 85bde1122d
Merge pull request #2715 from migenius/migenius-fix-vs2013-build
fix vs2013 build
2019-10-22 20:23:22 +02:00
Kim Kulling df3e22d9ba
Merge branch 'master' into migenius-fix-vs2013-build 2019-10-21 20:57:29 +02:00
Malcolm Tyrrell 9bc2648615
Merge branch 'master' into fix-gltf-importer-crash 2019-10-21 15:29:18 +01:00