Commit Graph

12461 Commits (a51500ba2be28592c49f601b79a7030143232c11)

Author SHA1 Message Date
Kim Kulling 8fb7ba3444
Merge branch 'master' into modernize-smartptrs-literals 2022-11-29 09:58:17 +01:00
Kim Kulling 6f6f77232e
Merge pull request #4813 from assimp/kimkulling/improve_github_parallel_build
Introduce --parallel instead of .j
2022-11-29 09:57:52 +01:00
Kim Kulling 22cff318dc
Introduce --parallel instead of .j
Just use parallel command to improve the readability.
2022-11-29 09:34:56 +01:00
Kim Kulling f3f533c390
Merge branch 'master' into master 2022-11-23 23:00:29 +01:00
Kim Kulling b6adb9f2dd
Merge pull request #4805 from CMDR-JohnAlex/patch-1
Fixed some grammar and spelling mistakes
2022-11-22 23:49:46 +01:00
Kim Kulling 8f0e2db974
Merge branch 'master' into patch-1 2022-11-22 20:51:07 +01:00
Kim Kulling 10b99dc4ca
Merge pull request #4807 from DavidKorczynski/cifuzz-int
Add CIFuzz GitHub action
2022-11-22 20:46:51 +01:00
Kim Kulling 1476d50c7d
Merge branch 'master' into cifuzz-int 2022-11-22 19:10:03 +01:00
naota29 ab82428bb5
Merge branch 'master' into master 2022-11-22 07:15:38 -08:00
Kim Kulling 88041152ac
Merge pull request #4809 from assimp/kimkulling/fix_possible_overflow_issue-3422
Add overfolow check for invalid data.
2022-11-22 11:04:51 +01:00
Kim Kulling 5689ac7869
Add overfolow check for invalid data.
- closes https://github.com/assimp/assimp/issues/3422
2022-11-22 10:50:52 +01:00
David Korczynski 355ebbedf3 Add CIFuzz GitHub action 2022-11-21 16:45:38 -08:00
Justice Colby 371d5c78f4 Updated ConvertMaterials function to assign appopriate material index when using material references. 2022-11-21 15:49:48 -08:00
Kim Kulling b3daec65a0
Merge pull request #4787 from Beilinson/KHR_materials_emissive_strength
Added support for KHR_materials_emissive_strength
2022-11-21 23:51:55 +01:00
John Alexander Le Roux 80449dd014
Fixed some grammar and spelling mistakes 2022-11-21 15:51:21 -05:00
Kim Kulling 1d1cd93371
Merge branch 'master' into KHR_materials_emissive_strength 2022-11-21 20:55:13 +01:00
Adam Beili 5441f07d05
Merge branch 'master' into refactor/KHR_material_specular 2022-11-19 17:40:22 +02:00
Kim Kulling 6392dbfe4d
Merge pull request #4801 from jakrams/fbx-out-of-memory-fix
Don't hide out-of-memory during FBX import
2022-11-18 20:40:59 +01:00
Adam 1cd5841b2f . 2022-11-18 17:24:37 +02:00
Adam Beili 3b5e34ab30
Merge branch 'master' into refactor/KHR_material_specular 2022-11-18 16:10:39 +02:00
Adam Beili 863637a27e
Merge branch 'master' into KHR_materials_emissive_strength 2022-11-18 16:04:32 +02:00
Jan Krassnigg 08f2f0f82f Don't hide out-of-memory during FBX import 2022-11-18 13:50:33 +01:00
Kim Kulling 11fe77c446
Merge pull request #4800 from assimp/kimkulling/add_missing_header_issue-4720
Add missing header for Ubuntu 16 and Mac
2022-11-18 11:57:57 +01:00
Kim Kulling 3c51eafaf4
Add missing headerh will be needed on Ubuntu
- closes https://github.com/assimp/assimp/issues/4720
2022-11-18 11:39:51 +01:00
Adam Beili b8b515cbed
Merge branch 'master' into refactor/KHR_material_specular 2022-11-17 20:31:40 +02:00
Aaron Gokaslan b2cfe47d4e
Merge branch 'master' into modernize-smartptrs-literals 2022-11-17 12:22:08 -05:00
Kim Kulling 7f35bfb9e3
Merge branch 'master' into KHR_materials_emissive_strength 2022-11-15 21:37:36 +01:00
Kim Kulling 97d7f685ba
Merge pull request #4794 from assimp/kimkulling/prepare_submodule_update
Update dependabot.yml
2022-11-13 20:48:44 +01:00
Kim Kulling 49b3649264
Add submodule update. 2022-11-13 19:33:12 +01:00
Kim Kulling bea3924fce
Update dependabot.yml
- Add update of submodules
2022-11-13 19:32:09 +01:00
Adam ffaf378ee6 fixed misnamed matkey 2022-11-10 20:37:46 +02:00
Adam Beili ce7a52fd19
Merge branch 'master' into refactor/KHR_material_specular 2022-11-10 20:21:30 +02:00
Adam 822b240694 Support both pbrSpecGlos and materials_specular 2022-11-08 23:09:50 +02:00
Adam Beili 95d98ec98b
fixed indentation error 2022-11-08 20:55:20 +02:00
Adam Beili 49bc22ddb5
Merge branch 'master' into KHR_materials_emissive_strength 2022-11-08 20:51:20 +02:00
Aaron Gokaslan 3730b7414f Use make_shared in IFCBoolean 2022-11-08 11:30:53 -05:00
Aaron Gokaslan d635bc6914 Fix some indentation 2022-11-08 11:19:12 -05:00
Aaron Gokaslan ccfb175460 Apply various clang-tidy checks for smartprs and modern C++ types 2022-11-08 11:03:55 -05:00
Kim Kulling cfed74516b
Merge pull request #4785 from Skylion007/add-missing-std-move
chore: add missing std moves and perfect forwards
2022-11-08 15:03:29 +01:00
Kim Kulling b717b1cd3e
Retrigger the build
Fix review findings
2022-11-08 13:39:56 +01:00
Aaron Gokaslan 97cb1c6b15 Fix perfect fowards 2022-11-07 11:01:16 -05:00
Aaron Gokaslan 5a0df03d2b Fix another missing move in glTFCommon.h 2022-11-07 09:34:00 -05:00
Adam Beili 945d93b46a fixed indentation 2022-11-04 09:37:28 -07:00
Adam 852ea8325c Added support for KHR_materials_emissive_strength
according to spec https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_materials_emissive_strength
2022-11-03 23:11:21 +02:00
Aaron Gokaslan 899f8e1d17 Remove redundant ctor 2022-11-03 12:46:40 -04:00
Aaron Gokaslan 02378b5e70 Add one more missing move 2022-11-03 12:36:58 -04:00
Aaron Gokaslan 8da3d277c7 add missing std moves 2022-11-03 12:35:10 -04:00
Kim Kulling 9a5d628232
Merge pull request #4776 from assimp/kimkulling/fix_nullptr_dereferecing_issue-4771
Fix: Avoid nullptr dereferencing + refactorings.
2022-10-29 17:25:06 +02:00
Kim Kulling 99e515fbfd Fix:Fix possible nullptr dereferencing + refactorings. 2022-10-29 17:08:26 +02:00
Kim Kulling c2967cf79a
Merge pull request #4759 from Let0s/trailing_zero_fix_collada_exporter
Fixed error with trailing zero symbol as placeholder character
2022-10-23 18:34:28 +02:00