Ben Sewell
3e6fc3a64b
Merge remote-tracking branch 'origin/master' into bensewell-fixifcopening4343
2022-01-20 09:43:45 +00:00
Kim Kulling
c142676908
Merge pull request #4346 from assimp/kimkulling-fuzzer_ase_outofbounds_issue_4232
...
ASE: Fix material parsing
2022-01-20 10:40:00 +01: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
985a5b9667
Merge pull request #4342 from assimp/krishty-new-file-detection
...
Krishty new file detection
2022-01-19 23:05:27 +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
Kim Kulling
141c6ca270
Merge pull request #4339 from Esri/jere9309/read_collada_materials
...
Collada: Read all instance_material child nodes
2022-01-18 20:28:39 +01:00
Jeremy Sigrist
59f28e168e
Merge branch 'master' into jere9309/read_collada_materials
2022-01-18 09:55:33 -08:00
Kim Kulling
3cca102531
Merge pull request #4265 from Garux/IQM
...
add Inter-Quake Model (IQM) Importer
2022-01-17 21:43:33 +01:00
Kim Kulling
6e50b04ae0
Merge branch 'master' into IQM
2022-01-17 18:33:37 +01:00
Kim Kulling
f21ff66505
Merge pull request #4323 from tanolino/patch-1
...
Locale independent meter scale
2022-01-17 18:32:24 +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
Léon
db162939b2
Merge branch 'master' into respect-cmake-output-variables
2022-01-16 16:19:03 +01:00
Kim Kulling
41cfcc7d16
Merge pull request #4336 from kovacsv/common_base64
...
Move Base64 encode/decode functionality to the common folder
2022-01-16 14:44:54 +01:00
Kim Kulling
f8253c3e3c
Update Base64.hpp
2022-01-16 13:21:01 +01:00
Kim Kulling
7eec3f0d8f
Update copyrights.
2022-01-16 13:19:25 +01:00
Viktor Kovacs
c8ab39dd04
Merge branch 'master' into common_base64
2022-01-15 23:42:56 +01:00
Léon
fe40ddf9a9
Merge branch 'master' into respect-cmake-output-variables
2022-01-14 16:45:27 +01:00
Kim Kulling
5976d54437
Merge pull request #4204 from TThulesen/so-unloading
...
Allow dlclose of so library by avoiding unique symbols.
2022-01-13 20:32:02 +01:00
Kim Kulling
d3e24196c0
Merge branch 'master' into so-unloading
2022-01-13 20:19:23 +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
Léon
8a7576b85c
Check for variable definition rather than empty string
2022-01-12 15:04:41 +01:00
