257927d7cf
Merge branch 'master' into Android-Script-Update
2022-03-24 18:59:16 +01:00
ba6c67c328
Merge pull request #4464 from assimp/kimkulling/revert_static_runtime_Selection_for_all
...
Use static runtime only on option is selected
2022-03-24 08:01:49 +01:00
0a56065962
Use static runtime only on option is selected
2022-03-24 00:41:07 +01:00
537c46a42a
Prevent nullptr access to normals-array in bitangent computation
2022-03-23 15:45:09 +01:00
90a24440db
- Adapted bat file to new NDK and toolchain
...
- Able to build x86, x86_64, armv8, armv7 for android
- Automatically detects latest ndk on your system
2022-03-18 17:01:45 +01:00
5ec7e57b99
Merge branch 'assimp:master' into master
2022-03-17 15:00:09 -04:00
68d33a6e13
Added support for more bone weights in GLTF2
...
The GLTF2 importer doesn't actually read beyond the first four bone weights (first attribute). This patch expands the parser to store as many bone weights as are available in the file.
2022-03-17 14:55:26 -04:00
19f2a624a9
Merge pull request #4451 from Promit/promit/gltf-attrib-bug-fix
...
GLTF2 attribute name/parse bug fix
2022-03-17 11:35:44 +01:00
765b38cf04
Update glTF2Asset.inl
...
Fixing mistakes in attribute names for GLTF. This causes attribute index to not be parsed out correctly (e.g. JOINTS_1) and fails the scene load.
2022-03-16 16:49:45 -04:00
a916a0eda5
Merge pull request #4448 from assimp/kimkulling/MDL-fix_stackoverflow-issue4447
...
Fix stack-overflow in MDLLoader
2022-03-16 14:14:46 +01:00
c2b05acaa6
Fix stack-overflow in MDLLoader
...
- Use correct len to copy filename.
- Closes https://github.com/assimp/assimp/issues/4447
2022-03-16 13:59:21 +01:00
a828114a1d
Merge pull request #4446 from assimp/kimkulling/mdlimporter_fix_nullptr_dereferencing
...
Fix nullptr dereferencing
2022-03-16 10:23:29 +01:00
552f3a308d
Fix nullptr dereferencing
...
- Check if we have any texture coordinates before calculating them
- closes https://github.com/assimp/assimp/issues/4445
2022-03-16 10:08:20 +01:00
784d9615f5
Merge pull request #4444 from EYHN/windows-crt
...
Add USE_STATIC_CRT option
2022-03-15 21:55:21 +01:00
6484dd6825
Merge branch 'master' into windows-crt
2022-03-15 21:29:21 +01:00
d594e6eea4
Merge branch 'master' into obj-pbr-explicit
2022-03-15 14:30:24 +01:00
bcee205542
Merge pull request #4437 from jaefunk/issue_4349
...
add ifndef guard for resolve to fails to compile
2022-03-15 14:28:43 +01:00
0904490150
Merge branch 'master' into issue_4349
2022-03-15 14:11:57 +01:00
7919461951
Merge pull request #4441 from assimp/kimkulling/fix_doxygen_version
...
Update version in doxy-config
2022-03-15 14:11:38 +01:00
e4fb0e0960
Merge branch 'master' into kimkulling/fix_doxygen_version
2022-03-15 13:33:54 +01:00
d87111983a
Merge pull request #4431 from TerenceRussell/master
...
Added missing ObjMaterial.h to CMakeLists
2022-03-15 13:33:13 +01:00
b1dc8cfe56
Merge branch 'master' into master
2022-03-15 11:58:45 +01:00
7296ffc3f5
Merge pull request #4426 from sacereda/info-material-properties
...
Add properties information on assimp info command line
2022-03-15 11:57:58 +01:00
b567497a17
Merge branch 'master' into info-material-properties
2022-03-15 10:57:14 +01:00
e1dae1402e
Merge pull request #4425 from sacereda/metallic-roughness-split
...
glTF2: Metallic roughness split
2022-03-15 10:56:43 +01:00
68f3386c7b
Merge branch 'master' into metallic-roughness-split
2022-03-15 08:38:38 +01:00
9e0357a8b6
Merge pull request #4423 from youkeyao/parse_obj_anisotropy
...
Fix getting anisotropy in obj
2022-03-15 08:38:13 +01:00
72888c49f6
Merge branch 'master' into parse_obj_anisotropy
2022-03-15 08:13:35 +01:00
cd7df53a72
Add USE_STATIC_CRT option
2022-03-15 14:50:01 +08:00
4457d9300a
Merge branch 'master' into issue_4349
2022-03-14 15:41:20 +09:00
0ef830d2b1
Update version in doxy-config
2022-03-12 16:57:27 +01:00
729ab8ae33
Trying to fix reorder error
2022-03-12 08:15:11 +01:00
26bb601d8f
Fix includes
2022-03-12 08:03:27 +01:00
51e248909f
Avoid setting metallic/roughness/sheen/clearcoat properties when they are not found on mtl file.
2022-03-11 22:29:59 +01:00
e02d51ec24
add ifndef guard for resolve to fails to compile
2022-03-11 10:51:13 +09:00
a305d14b8f
Merge pull request #4421 from RichardTea/update_ai_texture_type_max
...
Update AI_TEXTURE_TYPE_MAX
2022-03-10 13:54:55 +01:00
5e69517742
Merge branch 'master' into update_ai_texture_type_max
2022-03-10 11:37:46 +01:00
1b3ae63527
Merge pull request #4434 from karjonas/always_true
...
Fix 'i >= 0' always true bug
2022-03-10 11:37:03 +01:00
47f004517f
Add missing cast.
2022-03-10 10:33:29 +01:00
c14eccefaf
Fix 'i >= 0' always true bug
...
If 'disk_filename' does not contain a dot (.) then 'i' would overflow.
Making 'i' an int makes sure the for loop works as intended.
2022-03-09 23:05:47 +01:00
efe92e9ec1
Merge branch 'assimp:master' into master
2022-03-09 10:15:41 -07:00
1bf5dd2731
Merge pull request #4432 from assimp/kimkulling/init_fbx_texture_members_issue4429
...
Fix missing members and do some small refactorings.
2022-03-09 11:35:01 +01:00
26598dc6bd
Forget to save file.
2022-03-09 11:00:05 +01:00
76e10b96fc
Fix missing members and do some small refactorings.
2022-03-09 10:51:37 +01:00
b35879989c
Added missing ObjMaterial.h to CMakeLists
2022-03-08 20:00:22 -07:00
7aa87a9765
Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015
2022-03-08 19:10:53 +01:00
40d896ccc1
Merge pull request #4403 from JaroslavPribyl/fix/obj_with_bspline_crash
...
Fix parsing OBJ with free-form curve/surface body statements
2022-03-07 21:39:38 +01:00
ba379c20e1
Merge branch 'master' into fix/obj_with_bspline_crash
2022-03-06 17:39:57 +01:00
92b5c284ce
Merge pull request #4203 from RichardTea/deprecated_gltfpbr_macros
...
Reinstate a deprecated gltfpbr macro: AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS
2022-03-06 17:39:35 +01:00
9ca9254445
Merge branch 'master' into deprecated_gltfpbr_macros
2022-03-06 11:15:49 +01:00
Carlos Martinez Perez
Kim Kulling
Jan Krassnigg
Promit Roy
Promit Roy
eyhn
jaefunk
Sergio Acereda
Jonas Karlsson
Terence Russell
kimkulling