Commit Graph

12280 Commits (9d12dd6df37ba718817206bedf6f5cdb1ef8ecca)

Author SHA1 Message Date
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
Kim Kulling 295b0f4dbf
Merge branch 'master' into kimkulling/reorganize_doc 2022-09-18 20:50:40 +02:00
Kim Kulling c976ceec90
Merge pull request #4730 from waebbl/fix-version
Adjust cmake version
2022-09-18 19:32:53 +02:00
Kim Kulling be2eaac5a7 IMP: Reorganize doc 2022-09-18 19:31:48 +02:00
Kim Kulling 9d797c1489
Merge branch 'master' into fix-version 2022-09-18 19:11:34 +02:00
Kim Kulling 8d9a0f777d
Merge pull request #4731 from assimp/kimkulling/add_check_for_wall_enable_issue-4652
Add check for wall switch from cmake
2022-09-18 18:57:44 +02:00
Kim Kulling 704a187c90 FIX: Fix not initialized enums in unittest. 2022-09-18 18:10:56 +02:00
Kim Kulling 34eaf2d092 FIX: Initialize uninitialized enum in unittest. 2022-09-18 17:36:21 +02:00
Kim Kulling f59dd695c8 FIX: try to undefined behaviour by static_cast. 2022-09-18 16:03:54 +02:00
Kim Kulling 128922a798 FIX: Update unity build include file for gtest 2022-09-18 13:17:35 +02:00
Kim Kulling 2324e1ea51 Add missing file from gtest 2022-09-18 10:08:14 +02:00
Kim Kulling 09fe87b6d4 Googletest: Update to 1.12.1 2022-09-18 09:58:12 +02:00
Kim Kulling b3c7bdbdd6 Add check for wall switch from cmake 2022-09-17 18:16:42 +02:00
Bernd Waibel 8ce6f5ad27 Adjust cmake version
Closes: https://github.com/assimp/assimp/issues/4729
Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
2022-09-17 15:21:57 +02:00
Kim Kulling 1944c45944
Merge pull request #4728 from assimp/kimkulling/fix_treeview_issue-4726
Fix: Use ASCII treeview in assimp-cmd.
2022-09-17 08:57:23 +02:00
Kim Kulling 93e356b47d
Merge branch 'master' into kimkulling/fix_treeview_issue-4726 2022-09-17 01:34:36 +02:00
Kim Kulling ff0c50236b
Merge pull request #4723 from ranpro/patch-1
Missing path
2022-09-16 23:55:04 +02:00
Kim Kulling c67ff12b06
Merge branch 'master' into patch-1 2022-09-16 23:12:19 +02:00
Kim Kulling 4804101f1d
Merge pull request #4721 from assimp/kimkulling/fix-pointcloud-config-doc
Fix config documentation for STL pointcloud export
2022-09-16 23:12:05 +02:00
Kim Kulling 7ebe21958d FIX: Fix review findings 2022-09-16 22:13:58 +02:00
Kim Kulling e4c77aa4fa Fix: Use ASCII treeview in assimp-cmd. 2022-09-16 21:55:14 +02:00
曾是然 9fab0af16a
Missing path 2022-09-16 14:54:20 +08:00
Kim Kulling 0dd5cfe3bf
Fix config documentation for STL pointcloud export 2022-09-12 18:32:28 +02:00
Kim Kulling 7be7e5d93e
Merge pull request #4717 from Skylion007/perfect-forward-utMaybe
Perfect forward val to utMaybe.cpp
2022-09-12 10:15:03 +02:00
Kim Kulling b2ea018fd5
Use user-define element destructor. 2022-09-11 17:04:58 +02:00
Aaron Gokaslan 20755f4200 Perfect forward val to utMaybe 2022-09-09 10:55:45 -04:00
Kim Kulling 7b874983d0
Merge branch 'master' into SmallAllocationFixInFBXLoader 2022-09-08 20:15:52 +02:00
Kim Kulling 9519a62dd2
Merge pull request #4715 from assimp/kimkulling/cleanup_after_review
Kimkulling/cleanup after review
2022-09-08 20:13:43 +02:00
Kim Kulling 6a1a7c43cc
Update utMaybe.cpp 2022-09-08 19:32:42 +02:00
Kim Kulling ad1d0fcb45
Merge branch 'master' into kimkulling/cleanup_after_review 2022-09-08 19:09:49 +02:00
Kim Kulling 3af53a42aa
Fix typo 2022-09-08 19:06:05 +02:00
Kim Kulling fff977c0b5
Fix review findings. 2022-09-08 18:54:08 +02:00
Kim Kulling d475c132bf
Merge pull request #4716 from HiMemX/master
Minor obj export bugfix
2022-09-08 12:51:31 +02:00
HiMemX 4c9d270a5e
-Vertex export fix 2022-09-07 23:10:31 +02:00
HiMemX 7872297ab7
Delete ObjExporter.cpp 2022-09-07 23:10:06 +02:00
HiMemX 396e7bcdb4
-Obj vertex fix 2022-09-07 23:09:50 +02:00