Commit Graph

11493 Commits (822b2406943f4bc426b9260a5bba523d65aabe26)

Author SHA1 Message Date
Adam 822b240694 Support both pbrSpecGlos and materials_specular 2022-11-08 23:09:50 +02: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
Kim Kulling 002d50a54d
Merge pull request #4745 from cwoac/fix_defaults
fix incorrect documentation of defaults
2022-10-04 20:47:04 +02:00
Oliver Matthews 29032b176b
fix incorrect documentation of defaults 2022-10-03 11:49:38 +00:00
slinky55 e0fb1674d1 Merge branch 'clang-fix' of github.com:slinky55/assimp into clang-fix 2022-09-30 22:04:11 -04:00
slinky55 38ccb7e6c9 Used sizeof for buffer sizes instead of hardcoding values 2022-09-30 22:03:59 -04:00
slinky55 5f28370f7f
Merge branch 'master' into clang-fix 2022-09-30 21:57:32 -04:00
Kim Kulling b70277e1ab
Merge pull request #4738 from FlorianBorn71/MakeFBXParserResilientToMissingStreams
Make FBX parser resilient to missing data streams
2022-09-30 10:05:42 +02:00
slinky55 e2e45f7a14 Fixed issue with clang complaining about sprintf being depreciated 2022-09-30 00:34:33 -04:00
Kim Kulling 981677d4b9
Merge branch 'master' into MakeFBXParserResilientToMissingStreams 2022-09-30 00:13:45 +02:00
Kim Kulling 4b65d65af3
Merge pull request #4742 from feishengfei/master
FIX: C++ std::tuple constexpr initial list on old compiler
2022-09-29 22:20:15 +02:00
felix 0be5c567c9 FIX: C++ std::tuple constexpr initial list on old compiler [cont 1] 2022-09-29 23:34:23 +08:00
Kim Kulling 232d809ecc
Merge branch 'master' into master 2022-09-29 16:48:45 +02:00
Kim Kulling 816b8e6156
Update utglTF2ImportExport.cpp
Needed some change of scenery and optimized this a little bit.
2022-09-29 16:48:15 +02:00
feishengfei 789168ba31 FIX: C++ std::tuple constexpr initial list on old compiler 2022-09-29 09:38:40 +08:00
Kim Kulling ca11fceb65
Merge pull request #4734 from sashashura/patch-7
GitHub Workflows security hardening
2022-09-27 15:31:54 +02:00
Kim Kulling 92c7419a28
Merge branch 'master' into patch-7 2022-09-27 14:37:18 +02:00
Kim Kulling e477533a6d
Merge pull request #4737 from p12tic/prefix-stb-image-symbols
Prefix symbols from stb_image.h
2022-09-27 13:58:32 +02:00
Povilas Kanapickas f6a590065c Prefix symbols from stb_image.h
This makes it possible to link assimp statically into an executable with
another static library that includes stb_image.h without hiding its
symbols.
2022-09-23 04:08:21 +03:00
Povilas Kanapickas 22494bde17 Don't include stm_image implementation if using stb library from Hunter
Hunter compiles its own stb library binaries. Currently a second copy is
compiled by defining STB_IMAGE_IMPLEMENTATION in Assimp.cpp. This may
cause hard to understand bugs if this compiled copy ever becomes
different from what Hunter supplies.
2022-09-23 04:08:20 +03:00
Kim Kulling 9510132f3d
Merge branch 'master' into MakeFBXParserResilientToMissingStreams 2022-09-21 14:40:37 +02:00
Kim Kulling 9a11cabb06
Merge pull request #4739 from assimp/kimkulling/update-newer-visualsudio-versions
Introduce newer versions for MSVC Version
2022-09-21 14:39:38 +02:00
Kim Kulling 18cbe89a4c
Introduce newer versions for MSVC Version 2022-09-21 13:45:21 +02:00
Florian Born 7eb9edf0b9 Make FBX parser resilient to missing data streams 2022-09-21 11:45:54 +02:00
Kim Kulling 65b14ef79d
Merge pull request #4736 from assimp/kimkulling/fix_heap-buffer-overflow_in_md5_issue-4965
FIX: Fix head overflow in MD5-parser.
2022-09-20 21:52:13 +02:00
Kim Kulling 6415c0bfc9 FIX: Use attribute to fix warning. 2022-09-20 21:39:09 +02:00
Kim Kulling 1f61f0c3de FIX: Caculate buffer end pointer after initing all attributes 2022-09-20 21:35:44 +02:00
Kim Kulling f1766c4bd5 FIX: Fix head overflow in MD5-parser. 2022-09-20 21:03:58 +02:00
Alex 79c9c82026 build: harden sanitizer.yml permissions
Signed-off-by: Alex <aleksandrosansan@gmail.com>
2022-09-19 23:32:11 +02:00
Alex f39606589e build: harden ccpp.yml permissions
Signed-off-by: Alex <aleksandrosansan@gmail.com>
2022-09-19 23:31:58 +02:00
Kim Kulling a165dbc6ff
Merge pull request #4732 from assimp/kimkulling/reorganize_doc
IMP: Reorganize doc
2022-09-18 21:05:07 +02:00