Commit Graph

4322 Commits

Author SHA1 Message Date
Mike Samsonov
375ee17339 Merge branch 'fix_memory_leak_in_gltf2_on_exception' of https://github.com/muxanickms/assimp into fix_memory_leak_in_gltf2_on_exception 2019-11-19 17:44:05 +00:00
Mike Samsonov
91af4b7476 fix the crash 2019-11-19 17:43:31 +00:00
Kim Kulling
5985bdfebf Merge branch 'master' into fix_memory_leak_in_gltf2_on_exception 2019-11-19 18:11:10 +01:00
Mike Samsonov
12f184867e Fix for memory leak in glTF2 Importer if an exception has been thrown 2019-11-19 17:05:24 +00:00
Kim Kulling
7e222f0730 fix invalid cast. 2019-11-18 18:43:28 +01:00
Kim Kulling
75204e20bd fix invalid setup for texture enum. 2019-11-16 19:22:37 +01:00
Kim Kulling
17257cd2ae just a try, i dunno have a clue ... 2019-11-16 15:51:26 +01:00
Kim Kulling
2eed8b1820 TextureTransform: set material transform only when the extension is provided. 2019-11-16 08:08:57 +01:00
Kim Kulling
a8182d86cb fix initialization + some vs2019 compiler warnings. 2019-11-15 19:38:37 +01:00
Kim Kulling
17946e26ef add missing setup of texture transform in aiMaterial. 2019-11-15 18:35:33 +01:00
Kim Kulling
04db5cd5ea closes https://github.com/assimp/assimp/issues/2119: initial version. 2019-11-14 21:11:53 +01:00
Kim Kulling
aa25c815bd closes https://github.com/assimp/assimp/issues/1320: make sure build works with all exporter disabled. 2019-11-10 09:47:50 +01:00
Mike Samsonov
adec426b7c Fix for exporting fbx bigger than 2GB 2019-11-05 17:11:56 +00:00
Kim Kulling
d29185ec7d Merge branch 'master' into master 2019-11-03 21:22:01 +01:00
Zoltan Baldaszti
dda46f5f4d Merge branch 'master' into master 2019-11-02 01:14:04 +01:00
bzt
7201ebdccc Make Clang happy 2019-11-01 21:52:11 +01:00
bzt
7d9e9aadbb Asked modifications and unit test 2019-11-01 17:21:24 +01:00
Mike Samsonov
536fea1c8d operator less for old compilers 2019-11-01 14:50:30 +00:00
Mike Samsonov
55c2a3edb9 FBX orphant embedded textures 2019-11-01 12:29:54 +00:00
bzt
8ebd48442e Made the M3D SDK C++ wrapper optional 2019-11-01 03:39:36 +01:00
bzt
3bf81375da Fixed clang's problem with register keyword 2019-10-30 03:06:24 +01:00
bzt
37cc29c020 Fixed clang's problem with register keyword 2019-10-30 03:04:33 +01:00
bzt
0ff3e40157 Fixed clang's casting issue and MSVC's buffer allocation problem 2019-10-30 02:35:51 +01:00
bzt
60e9157699 Fixed AI_MATKEY list string constant issue. My gcc didn't comply about this 2019-10-30 01:37:28 +01:00
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
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
18555abed0 Merge branch 'master' into migenius-fix-pbrsg 2019-10-28 20:08:47 +01:00
Kim Kulling
571d64e3c1 Merge branch 'master' into migenius-fix-doublefree 2019-10-28 07:51:19 +01:00
Kim Kulling
61ea5a4ac6 Merge branch 'master' into collada_zae_textures_2710 2019-10-27 18:24:16 +01: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
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
93d87c775d Merge branch 'master' into master 2019-10-27 09:00:47 +01: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