Commit Graph

12244 Commits (2f6f58707dcbe7d1741a7e65fcd6a9f080171fa2)

Author SHA1 Message Date
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
Sergey ac87b9ce7e fixed error with trailing zero symbol as placeholder character 2022-10-19 09:30:32 +03:00
Kim Kulling f8f12c8609
Merge pull request #4755 from emvivre/master
* fix bug reading ply file in case of presence of "end_header\n<BINARY_DATA>..." with <BINARY_DATA> starting by "\n"
2022-10-18 21:13:35 +02:00
Kim Kulling 35136bc90c
Merge branch 'master' into master 2022-10-18 19:25:14 +02:00
Kim Kulling 57c156019f
Merge pull request #4761 from assimp/kimkulling/fix_missing_double_export_for_json_issue-4677
Fix: Add missing ahndling for double export in json
2022-10-18 19:22:01 +02:00
Kim Kulling 07aef23d24 Fix: Add missing ahndling for double export in json 2022-10-18 19:05:04 +02:00
emvivre a77dcffb19
Merge branch 'master' into master 2022-10-17 11:20:33 +02:00
Kim Kulling a3c209f2ca
Merge pull request #4757 from assimp/kimkulling/Fix_link_openddl_static_when_enabling_static_lib_issue-4516
Use correct flags for openddl for static libs
2022-10-16 18:46:22 +02:00
Kim Kulling e7cea5a283 Use correct flags for openddl for static libs 2022-10-16 18:30:45 +02:00
emvivre 0bef3a2e0b
Merge branch 'master' into master 2022-10-16 15:05:54 +02:00
Kim Kulling 565539bb68
Merge pull request #4756 from assimp/kimkulling/fix_use_correct_eps_in_interpolation_issue-4751
FIX: Use correct epsilon
2022-10-15 18:12:56 +02:00
emvivre fad49e0d12
Merge branch 'master' into master 2022-10-15 18:08:08 +02:00
Kim Kulling 4ac3b1fef5 FIX: Use correct epsilon 2022-10-15 16:11:02 +02:00
Kim Kulling e2f54d3c48
Merge pull request #4754 from rhabacker/master
Fix build error: ‘temp’ may be used uninitialized in this function
2022-10-15 09:16:36 +02:00
François Lozes e17976e6e2 * fix bug reading ply file in case of presence of "end_header\n<BINARY_DATA>..." with <BINARY_DATA> starting by "\n" 2022-10-14 13:16:18 +02:00
Ralf Habacker 3705336467 Fix build error: ‘temp’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
Fixes #4753
2022-10-13 08:30:04 +02:00
Kim Kulling 5a89d6fee1
Merge pull request #4744 from slinky55/clang-fix
Fixed issue with clang complaining about sprintf and vsprintf being depreciated
2022-10-06 08:13:53 +02:00
Kim Kulling 2e6c2315a2
Merge branch 'master' into clang-fix 2022-10-05 16:54:19 +02:00