sashashura
9ddc3a64d7
Fixes Crash in Assimp::ObjFileMtlImporter::getFloatValue
2022-07-16 13:55:08 +01:00
sashashura
772cfdc757
Fixes Heap-buffer-overflow in Assimp::ObjFileParser::getFace
2022-07-16 13:50:54 +01:00
sashashura
94c0e9d890
Fixes Heap-buffer-overflow in std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<ch
2022-07-16 13:48:39 +01:00
sashashura
a4274930e4
Fixes Heap-use-after-free in Assimp::DXFImporter::ExpandBlockReferences
2022-07-16 13:46:50 +01:00
sashashura
0c07ea7c71
Fixes Heap-buffer-overflow in SuperFastHash
2022-07-16 13:44:46 +01:00
Engin Manap
684909a691
Fix comments on PR
...
1) Use default instead of empty destructor
2) Remove debug code
2022-07-09 17:23:40 +02:00
Engin Manap
3e424f8119
Merge branch 'assimp:master' into master
2022-07-09 17:17:01 +02:00
Kim Kulling
6ad8ea395a
Merge branch 'master' into fix_stl_for_over_4GB
2022-07-09 09:58:10 +02:00
Engin Manap
e63426b89c
Fix collada parser fails on Mixamo exports
2022-07-08 23:42:41 +02:00
Engin Manap
3890b5dff5
Add missing = operator
...
implicit assignment operator is depricated, these classes were missing
explicit definitions of this operator.
It is causing warnings, specifically -Werror=deprecated-copy
2022-07-08 18:16:02 +02:00
Engin Manap
c3a89fd2d0
Fix non virtual destructor use
2022-07-08 18:16:02 +02:00
Engin Manap
ae276987a0
Remove unnecessary const qualifiers
...
These changes are part of enable -Wall, this specific changes are for
-Werror=ignored-qualifiers
2022-07-08 18:16:02 +02:00
Engin Manap
a10abe0283
Add fallthrough comment to switch case
...
This allows gcc to identify intentional fallthroughs, which are part all
-Wall. Specifically -Werror=implicit-fallthrough
2022-07-08 18:16:02 +02:00
tanolino
c23146bb20
Use size_t for the file size in cpp file
...
This pointer juggling in combination with STL files >4GB caused some nasty illegal memory access bugs here. So let's fix it.
2022-07-08 10:26:03 +02:00
Kim Kulling
c5dfcac08a
Update D3MFOpcPackage.cpp
2022-07-08 10:25:40 +02:00
tanolino
24d110199a
Use size_t for file size instead of unsigned int
...
This is one step to help us open files with more then 4 GB size.
2022-07-08 10:19:50 +02:00
Kim Kulling
e254f80a3a
Fix memory leak in D3MFOpcPackage
...
- closes https://github.com/assimp/assimp/issues/4628
2022-07-08 10:17:11 +02:00
Kim Kulling
e59b8fb448
Fix typo
2022-07-08 09:50:04 +02:00
Kim Kulling
70b2db19a8
Remove assertion test
...
- Code cleanup
- closes https://github.com/assimp/assimp/issues/4626
2022-07-08 09:47:33 +02:00
Kim Kulling
e9b08f35b2
Merge branch 'master' into master
2022-07-07 13:21:08 +02:00
Kim Kulling
77a2cdee76
Fix texture fetch for embedded textures in 3mf-files.
2022-07-06 20:59:42 +02:00
Kim Kulling
eeae6eac26
Update Q3DLoader.cpp
2022-07-05 23:01:18 +02:00
Kim Kulling
2d994e1a28
Fix possible bad_alloc exception for invalid file
...
- Fuzzer finding
- closes https://github.com/assimp/assimp/issues/3417
2022-07-05 22:50:54 +02:00
Kim Kulling
90b75cd6e7
Merge branch 'master' into fix/collada_empty_animation_name
2022-07-05 20:39:19 +02:00
Kim Kulling
5bce9e8ce5
Update MDLMaterialLoader.cpp
2022-07-05 20:09:16 +02:00
Kim Kulling
a6b1a35748
Try to fix issue 4238
...
- Fix possible nullptr dereferencing.
- closes https://github.com/assimp/assimp/issues/4238
2022-07-05 20:05:10 +02:00
Kim Kulling
6d26e91fc1
Merge branch 'master' into fix/collada_empty_animation_name
2022-07-05 09:28:39 +02:00
Kim Kulling
636d8bffe5
Merge branch 'master' into kimkulling/fix_memleak_in_xmlparser
2022-07-02 21:32:24 +02:00
Kim Kulling
9063216893
Fix a memory leak
2022-07-02 21:21:31 +02:00
Luca Della Vedova
0924c4710b
Fix nested animation name being lost in Collada
...
Signed-off-by: Luca Della Vedova <luca@openrobotics.org>
2022-06-29 11:09:54 +08:00
kimmi
d3c8201614
Fix token match string checks.
2022-06-28 20:31:03 +02:00
Onur Berk Töre
b392ff5ad1
Merge branch 'master' into otore19/sandbox
2022-06-21 21:34:50 +03:00
Onur Berk Tore
4f06c41802
Fix: Collada header updated
2022-06-21 21:08:11 +03:00
Kim Kulling
fff74a4ac0
Merge branch 'master' into patch-2
2022-06-21 13:39:23 +02:00
Onur Berk Tore
c2060a1f7e
Deletion: Removed unnessary header
2022-06-20 23:48:00 +03:00
Onur Berk Tore
1b53f41787
Feature: Utilizes removeEmptyBones flag for Collada
2022-06-20 23:46:29 +03:00
kovacsv
2486a681c1
Remove unused variable.
2022-06-20 21:07:34 +02:00
PercentBoat4164
487a9aca2f
Add support for GCC v12
2022-06-16 19:23:55 -04:00
Luca Della Vedova
079b7deb33
Merge branch 'master' of https://github.com/assimp/assimp into fix/collada_parser_sid
2022-06-13 10:20:46 +08:00
Kim Kulling
5adea2dbcf
Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015
2022-06-11 21:40:44 +02:00
Kim Kulling
aaa19903c6
Fix merge conflicts
2022-06-11 18:50:18 +02:00
Kim Kulling
02b0c89fa4
Fix usage of validation
2022-06-08 00:10:13 +02:00
Kim Kulling
4fb5cf4ba6
Fix possible nullptr exception
...
- closes https://github.com/assimp/assimp/issues/4418
2022-06-07 23:33:56 +02:00
Matthew Clendening
aca02190a7
Merge branch 'master' into fix_FBXConverter_double_precision
2022-06-06 10:01:13 -04:00
Kim Kulling
39a4627519
Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015
2022-06-02 21:47:29 +02:00
nsg
96d2052ed0
Merge branch 'master' into fix_fbx
2022-06-02 02:31:32 +09:00
Kim Kulling
03532eaec3
Merge branch 'master' into msvcfix
2022-06-01 17:11:06 +02:00
nsg
681eb3e91e
Fix Import a specific FBX model
2022-06-01 17:41:27 +09:00
Kim Kulling
e5cd85ac0c
Update M3DWrapper.h
2022-05-31 19:16:46 +02:00
Kim Kulling
472e15c405
Merge branch 'master' into kimkulling/link_stb_image_statically_issue_4467
2022-05-31 17:47:43 +02:00
Gargaj
f612865f22
fix msvc warnings-as-errors
2022-05-29 01:35:48 +02:00
Matthew Clendening
26233f1b77
Fixed FBXConverter build error (warning as error) when ASSIMP_DOUBLE_PRECISION is defined
2022-05-26 15:06:23 -04:00
Piroska Gabor
ddc63119b5
Using hex instead of decimal
2022-05-26 10:11:30 +02:00
Piroska Gabor
7ce447294f
I ran into an error while processing colored binary stl. Just a type but
...
better be fixed.
2022-05-24 19:47:24 +02:00
Luca Della Vedova
6b0a7a21a4
Store SID in SID field
...
Signed-off-by: Luca Della Vedova <luca@openrobotics.org>
2022-05-23 14:24:56 +08:00
Kim Kulling
ed3e218550
Bugfix: fix not initialized member attributes
2022-05-21 19:08:43 +02:00
tanolino
002d6dc016
Inifinite loop on bad import files
...
I had an import file that caused an infinite loop. I don't exactly know how this algorithm works here but maybe we should change it more.
Probably calculate the amount of steps and chop linear.
2022-05-18 15:22:11 +02:00
Kim Kulling
0f780fe141
Merge branch 'master' into MMD_Fixes
2022-05-12 10:00:00 +02:00
Aaron Gokaslan
787fcc160a
Clang-Tidy performance fixes
2022-05-11 14:03:45 -04:00
IOhannes m zmölnig
1d3d5c4bb6
Rename TextureTypeToString() to aiTextureTypeToString()
...
Closes: https://github.com/assimp/assimp/issues/4493
2022-05-01 13:27:42 +02:00
Kim Kulling
64a6968254
Add skeleton generation to aiScene
2022-04-28 21:43:02 +02:00
Kim Kulling
0afb594f40
Generate container for skeleton during FBX-Import
2022-04-28 21:19:10 +02:00
Kim Kulling
6cdd1d3cc6
Generate container for skeleton during FBX-Import
2022-04-28 21:12:26 +02:00
Kim Kulling
1ac9173e8c
Disable assertion tests floating point against inf for Intel oneAPI
...
- closes https://github.com/assimp/assimp/issues/4450
2022-04-28 10:08:01 +02:00
Kim Kulling
174b2fcf59
Fix invalid use of material reference.
2022-04-27 20:21:30 +02:00
Kim Kulling
37ec378b60
Fixx out-of-range access in ASE-Parser
...
- closes https://github.com/assimp/assimp/issues/4495
2022-04-27 19:52:23 +02:00
Kim Kulling
d14bff5a9f
Merge branch 'master' into master
2022-04-24 18:17:33 +02:00
Kim Kulling
37be87b0bd
Some minor findings
2022-04-19 23:37:16 +02:00
Mykhailo418
8a1dc87b4c
remove absolute_transform in FBXConverter
2022-04-18 18:10:59 +03:00
Mykhailo418
e3def37f42
assing absolute_transform to matrix
2022-04-18 17:26:37 +03:00
Mykhailo418
863e3e0ccb
FbxConverter, bone mOffsetMatrix update
2022-04-18 16:02:17 +03:00
Ichiro
9ab6ebd363
Fix foreach
2022-04-18 04:11:06 +09:00
Ichiro
128242e371
Fix ogre xml serializer
2022-04-18 01:28:03 +09:00
RedSkittleFox
feec92022f
Merge branch 'master' into MMD_Fixes
2022-04-13 21:07:58 +02:00
RedSkittleFox
5ab1be8d04
Fixed deprecated class usage; removed unsupported C++17 feature
2022-04-13 11:38:57 +02:00
RedSkittleFox
f26dc74f21
Fixed MMD Importer not loading files from buffer and enabled unit test
2022-04-13 02:51:12 +02:00
Kim Kulling
aa814a522d
Merge branch 'master' into obj-pbr-explicit
2022-04-12 11:12:58 +02:00
Kim Kulling
ae9f5b6fc5
Merge branch 'master' into user/jakras/bitangent-fuzzer-fix
2022-04-12 10:41:43 +02:00
Kim Kulling
6943e59886
Merge branch 'master' into obj-pbr-explicit
2022-04-08 14:36:57 +02:00
Kim Kulling
e5747dad9b
First concepts
2022-04-05 20:07:22 +02:00
Kim Kulling
97c7ab3c05
Move stb_image header into its own header file.
2022-04-05 19:53:41 +02:00
Kim Kulling
b8658cefe0
Link std_image statically.
2022-04-05 18:48:45 +02:00
Kim Kulling
88dadd6c40
Merge branch 'master' into patch-3
2022-04-02 11:22:33 +02:00
xiaohunqupo
a050dee096
Fix compile error:When enable macro ASSIMP_DOUBLE_PRECISION
2022-03-31 16:08:39 +08:00
xiaohunqupo
de6e90a657
Fix commit error
2022-03-31 15:36:57 +08:00
xiaohunqupo
2152aae2a3
Fix compile error due to namespace conflicts in VC140.
2022-03-31 15:34:49 +08:00
xiaohunqupo
cc515746f7
Fix v140 compile errror
2022-03-31 14:58:31 +08:00
Danny许
8e075ce713
Update ObjFileParser.cpp
2022-03-31 14:53:33 +08:00
Danny许
18c4ebaa13
Fix compile in VC140
2022-03-31 14:28:35 +08:00
Filip Lundgren
4175198d04
Detect Roughness factor exported by Blender
...
Matches the logic used by Blender's own FBX exporter / importer.
2022-03-26 22:33:10 +01:00
Jan Krassnigg
537c46a42a
Prevent nullptr access to normals-array in bitangent computation
2022-03-23 15:45:09 +01:00
Promit Roy
5ec7e57b99
Merge branch 'assimp:master' into master
2022-03-17 15:00:09 -04:00
Promit Roy
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
Promit Roy
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
Kim Kulling
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
Kim Kulling
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
Kim Kulling
d594e6eea4
Merge branch 'master' into obj-pbr-explicit
2022-03-15 14:30:24 +01:00
Kim Kulling
68f3386c7b
Merge branch 'master' into metallic-roughness-split
2022-03-15 08:38:38 +01:00
Kim Kulling
72888c49f6
Merge branch 'master' into parse_obj_anisotropy
2022-03-15 08:13:35 +01:00
Sergio Acereda
26bb601d8f
Fix includes
2022-03-12 08:03:27 +01:00
Sergio Acereda
51e248909f
Avoid setting metallic/roughness/sheen/clearcoat properties when they are not found on mtl file.
2022-03-11 22:29:59 +01:00
kimkulling
26598dc6bd
Forget to save file.
2022-03-09 11:00:05 +01:00
kimkulling
76e10b96fc
Fix missing members and do some small refactorings.
2022-03-09 10:51:37 +01:00
Kim Kulling
ba379c20e1
Merge branch 'master' into fix/obj_with_bspline_crash
2022-03-06 17:39:57 +01:00
Kim Kulling
80a8807c47
Fix compiler warnings
2022-03-05 20:37:34 +01:00
Kim Kulling
d4527d4e87
Merge branch 'master' into master
2022-03-05 14:00:32 +01:00
Sergio Acereda
cfe84b9260
Use generic METALNESS and DIFFUSE_ROUGHNESS texture types
2022-03-03 16:18:25 +01:00
Sergio Acereda
52008ec989
Apply clang-format
2022-03-03 15:42:23 +01:00
youkeyao
9b227fc262
Fix getting anisotropy in obj
2022-03-03 01:01:34 +08:00
Jaroslav Pribyl
62930076af
Merge branch 'master' into fix/obj_with_bspline_crash
2022-02-26 04:03:59 +01:00
sola
c73ff82fc4
FBXConvert::ConvertMeshMultiMaterial: allocate memory using variable count_vertices
2022-02-25 19:58:44 +08:00
Kim Kulling
72da1e6d7b
Merge branch 'master' into master
2022-02-23 21:20:39 +01:00
Kim Kulling
6f31254ae1
Ensure dictionary for LazyDics is created before adding content to it
2022-02-23 20:57:15 +01:00
Terence Russell
4ddacdb5df
Expose the original OBJ illum model as a material property.
2022-02-22 17:55:41 -07:00
Kim Kulling
466b34cf53
Merge branch 'master' into kimkulling/fix_ordering_of_gltf2_issue4407
2022-02-22 21:09:11 +01:00
Kim Kulling
aa04ee89f1
Fix init order to fix build
2022-02-22 21:07:42 +01:00
Kim Kulling
a6808b868c
Small code cleanup
2022-02-22 21:07:23 +01:00
Jaroslav Přibyl
480d6fee2a
cleanup
2022-02-22 01:46:47 +01:00
Jaroslav Přibyl
62c9347985
fixed obj parsing with cstype
2022-02-22 01:32:41 +01:00
Terence Russell
17123ed4a1
Add support for bump -bm (bump/normal multiplier)
2022-02-17 22:10:46 -07:00
Kim Kulling
9bf5d01469
Fix invalid initialization of constexpr.
2022-02-16 21:22:35 +01:00
Kim Kulling
9e23d771bc
Fix invalid initialization of constexpr.
2022-02-16 21:19:17 +01:00
Kim Kulling
76a7614c4b
Adapt ai_epsilon to code
2022-02-16 20:07:27 +01:00
Kim Kulling
067c5d9ec4
Refactoring: add usage of ai_epsilon to fbx.
2022-02-16 00:17:26 +01:00
Kim Kulling
5d8e5fd130
Update XFileParser.cpp
...
Fix typo
2022-02-15 16:10:33 +01:00
Kim Kulling
7c13b16d30
Add missing flush modes supported by zlib
2022-02-14 20:51:06 +01:00
Kim Kulling
416f823866
Merge branch 'kimkulling/introduce_compression' of https://github.com/assimp/assimp into kimkulling/introduce_compression
2022-02-14 20:25:27 +01:00
Kim Kulling
c718500c55
Fix last review findings and finish windows bits
2022-02-14 20:25:18 +01:00
Kim Kulling
9a585d7b3c
Merge branch 'master' into kimkulling/introduce_compression
2022-02-13 19:58:22 +01:00
Kim Kulling
52b6c4f7c0
Fix broken importer and add some review findings2
2022-02-13 18:44:22 +01:00
Kim Kulling
3e09d462fa
Fix compression for fbx
2022-02-12 09:25:45 +01:00
Kim Kulling
23b43d1825
Fix X-Importer decompress algorithm
2022-02-08 21:43:14 +01:00
Kim Kulling
27bcddfb1a
Migrate more importers to compression class
2022-02-08 20:43:47 +01:00
Kim Kulling
ce61ea56a5
Merge branch 'master' into kimkulling/introduce_compression
2022-02-07 10:02:51 +01:00
Kim Kulling
9a15ca1007
LWO: validate enum value before parsing it
...
- Check for valid enum values
- closes https://github.com/assimp/assimp/issues/4236
2022-02-07 09:08:23 +01:00
Kim Kulling
eb5a7938e0
Remove dead code
2022-02-06 21:16:04 +01:00
Kim Kulling
9335cc30ab
INtroduce compression class to encapsulate compression via zlib
2022-02-06 20:42:58 +01:00
Kim Kulling
f217bd4b5f
Update HMPLoader.cpp
2022-01-26 19:42:09 +01:00
Kim Kulling
305d1f45aa
Add some constants and fix compile
2022-01-26 19:36:38 +01:00
Kim Kulling
50b00d33b5
HMP: Fix override during copying position data
...
- Fix override
- closes https://github.com/assimp/assimp/issues/4235
2022-01-26 19:22:52 +01:00
Kim Kulling
06fffb4f83
ASE: Fix warning unreachable code
2022-01-24 20:05:25 +01:00
Ben Sewell
3e6fc3a64b
Merge remote-tracking branch 'origin/master' into bensewell-fixifcopening4343
2022-01-20 09:43:45 +00:00
Kim Kulling
c1968823ad
ASE: Fix material parsing
...
- Fuzzer error found when material access get's an out-of-bound access.
- Break parsing when material index gets out of range.
- closes https://github.com/assimp/assimp/issues/4232
2022-01-20 10:25:52 +01:00
Kim Kulling
cbc4459dda
Fix compile error: missing var
2022-01-19 22:03:11 +01:00
Kim Kulling
43763f53d6
Fix compile error: missing var
2022-01-19 22:00:53 +01:00
Kim Kulling
15b08f643a
Fix warning: unused variable
2022-01-19 21:55:24 +01:00
Kim Kulling
17d5633a5b
Add missing SImpleExtensionCheck
2022-01-19 21:42:14 +01:00
Kim Kulling
4cb76e6a18
Update UnrealLoader.cpp
2022-01-18 22:29:55 +01:00
Kim Kulling
12b01dd575
Update SMDLoader.cpp
2022-01-18 22:28:54 +01:00
Kim Kulling
7b24437f06
Update SIBImporter.cpp
2022-01-18 22:27:19 +01:00
Kim Kulling
ec63fe74ee
Update RawLoader.cpp
2022-01-18 22:26:16 +01:00
Kim Kulling
088658b359
Update Q3BSPFileImporter.cpp
2022-01-18 22:25:43 +01:00
Kim Kulling
b4dee9220d
Update Q3BSPFileImporter.cpp
2022-01-18 22:25:22 +01:00
Kim Kulling
ffc13f18ba
NFF: reenable canRead
2022-01-18 22:24:11 +01:00
Kim Kulling
331cb5ac72
Update M3DImporter.cpp
2022-01-18 22:23:01 +01:00
Kim Kulling
c3b91dd766
C4D. Fix merge conflicts
2022-01-18 22:21:58 +01:00
Kim Kulling
ea5996307a
Update B3DImporter.cpp
2022-01-18 22:20:37 +01:00
Kim Kulling
efd1d36aa9
Merge branch 'master' into krishty-new-file-detection
2022-01-18 22:17:50 +01:00
Kim Kulling
959af1ac4d
Revert change
2022-01-18 21:37:49 +01:00
Kim Kulling
7350baea93
Revert change
2022-01-18 21:36:55 +01:00
Kim Kulling
cf47411742
Revert change
2022-01-18 21:36:02 +01:00
Kim Kulling
1e80630d5d
Revert change.
2022-01-18 21:35:09 +01:00
Kim Kulling
037732c429
Revert change
2022-01-18 21:34:18 +01:00
Kim Kulling
cff213d4dd
Revert change
2022-01-18 21:33:05 +01:00
Kim Kulling
9d0006fecb
Revert change
2022-01-18 21:32:06 +01:00
Kim Kulling
5af79cac1d
Fix unittests + small refactorings
2022-01-18 21:23:43 +01:00
Jeremy Sigrist
59f28e168e
Merge branch 'master' into jere9309/read_collada_materials
2022-01-18 09:55:33 -08:00
Kim Kulling
6e50b04ae0
Merge branch 'master' into IQM
2022-01-17 18:33:37 +01:00
Kim Kulling
f16e4fadc7
Merge branch 'master' into patch-1
2022-01-17 18:18:16 +01:00
Ben Sewell
415b0e19d9
Changes for gcc compatibility
2022-01-17 16:39:50 +00:00
Ben Sewell
65f2353105
IFC Reading: Fix opening reading.
2022-01-17 15:49:11 +00:00
Kim Kulling
cbde086bfb
Merge branch 'krishty-new-file-detection' of https://github.com/assimp/assimp into krishty-new-file-detection
2022-01-16 20:58:07 +01:00
Kim Kulling
acd70b35a0
Fix merge issues
2022-01-16 20:57:56 +01:00
Kim Kulling
6ad7505376
Merge branch 'master' into krishty-new-file-detection
2022-01-16 20:43:57 +01:00
Kim Kulling
05746acb07
Merge branch 'new-file-detection' of https://github.com/krishty/assimp into krishty-new-file-detection
2022-01-16 20:41:24 +01:00
Jeremy Sigrist
5aac72791d
Merge branch 'master' into jere9309/read_collada_materials
2022-01-12 10:12:58 -08:00
Jeremy Sigrist
e671d087e1
Collada: Read all instance_material child nodes
2022-01-12 09:52:12 -08:00
Viktor Kovacs
c71f4bc95a
Merge branch 'master' into common_base64
2022-01-11 18:46:08 +01:00
tanolino
f8abb015de
Merge branch 'master' into patch-1
2022-01-11 09:55:19 +01:00
Kim Kulling
f63b10bf45
OpenGEX: Fix usage of texture specular token
2022-01-10 21:22:44 +01:00
Viktor Kovacs
6b9732721a
Merge branch 'assimp:master' into common_base64
2022-01-10 21:15:31 +01:00
Kim Kulling
50c7301a38
Update copyrights
2022-01-10 21:13:43 +01:00
Kim Kulling
8cb5ab69b0
Merge branch 'master' into fix-bone-fit-check
2022-01-08 11:35:59 +01:00
Kim Kulling
776130534b
Fix nullptr-dereferencing
...
- Fix a possible nullptr-exception.
2022-01-06 22:35:32 +01:00
Alex Rebert
b14b34d2b8
LWSLoader: Fix out of bounds iterator access
...
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38947
Fix #4222
2022-01-05 15:43:16 -05:00
tanolino
089fc7311a
GCC might have an issue with value type Errors
2022-01-05 10:34:27 +01:00
tanolino
04d2d13172
Locale independent meter scale
...
`XmlParser::getRealAttribute(...)` will call `strtod` (or `wcstod`) which are both locale dependent. So on a German locale system a scale of 0.01 meter will be parsed to 0. In order to avoid that I use the `fast_atoreal_move<ai_real>()` method.
2022-01-05 10:10:38 +01:00
Colin Reeder
87e9dbac40
Fix bone fitted check in gltf2 exporter
2022-01-03 16:32:34 -07:00
kovacsv
125acf9ec8
Merge remote-tracking branch 'origin/master' into common_base64
2022-01-02 19:47:57 +01:00
kovacsv
bbe12240ca
Move Base64 encode/decode functionality to the common folder.
2022-01-02 19:47:43 +01:00
Kim Kulling
ab19cff328
Merge branch 'master' into pbr-obj
2021-12-31 08:33:30 +01:00
Kim Kulling
a86ab45161
Merge branch 'master' into ps-devel-fix-namespace-001
2021-12-31 08:20:24 +01:00
Peter Seiderer
a099fe7cd3
BlenderScene: use explicit namespace instead of using namespace
...
Fixes (using g++ Sourcery CodeBench Lite 2014.05-29 - 4.8.3 20140320):
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive]
const FileDatabase &db) const {
^
In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0,
from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47:
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive]
void Convert(T &dest, const FileDatabase &db) const;
^
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive]
const FileDatabase &db) const {
^
In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0,
from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47:
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive]
void Convert(T &dest, const FileDatabase &db) const;
^
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
2021-12-30 18:01:54 +01:00
Vyacheslav Vanin
2da06dd41a
Merge branch 'master' into fix-fbx-metalness-import
2021-12-26 17:31:33 +03:00
Garux
d11d2fc60d
fix Inter-Quake Model (IQM) Importer MSVC warnings
2021-12-24 18:36:25 +03:00
Kim Kulling
db2500c393
MDL: Do not try to copy empty embedded texture
...
- When an embedded texture is empty, skip it instead of trying to copy it. This must fail.
- closes https://github.com/assimp/assimp/issues/4238
- Found from the Google fuzzer.
2021-12-23 12:28:43 +01:00
Kim Kulling
635153b3a4
LWS-Import: Avoid access to empty string token
...
- Fix invalid access to string pointer when string token is empty
- closes https://github.com/assimp/assimp/issues/4222
2021-12-22 21:08:28 +01:00
Rene Sepulveda
19371af6e6
Support PBR properties/maps in Obj importer
2021-12-20 13:43:46 -05:00
Garux
46f618a6ef
add Inter-Quake Model (IQM) Importer
2021-12-18 15:34:58 +03:00
sssaoi
d7bf8d6e07
Fix compile error when ASSIMP_BUILD_NO_X3D_IMPORTER is define.
2021-12-18 14:50:22 +09:00