Commit Graph

11092 Commits (f86700f6f4e62e481e1e87f61819a0b5faf1ca51)

Author SHA1 Message Date
hgdagon f86700f6f4
Merge branch 'master' into assimp_resource 2022-05-04 02:12:08 +04:00
Kim Kulling abfb26ab6f
Merge pull request #4508 from hgdagon/master
Fixed library names for MinGW/MSYS2
2022-05-03 17:48:22 +02:00
Kim Kulling 3dd2dbd916
Merge branch 'master' into master 2022-05-03 17:19:06 +02:00
Kim Kulling e8abb0fc1c
Merge pull request #4512 from umlaeute/aiTextureTypeToString
Rename TextureTypeToString() to aiTextureTypeToString()
2022-05-02 10:14:41 +02:00
IOhannes m zmölnig 1d3d5c4bb6 Rename TextureTypeToString() to aiTextureTypeToString()
Closes: https://github.com/assimp/assimp/issues/4493
2022-05-01 13:27:42 +02:00
U-DESKTOP-0R560PH\George a7e2b3ad30 Fixed library names for MinGW/MSYS2 2022-04-30 08:14:16 -07:00
U-DESKTOP-0R560PH\George 94ebe71969 Resource script updates 2022-04-30 08:01:15 -07:00
Kim Kulling 461370946c
Merge pull request #4506 from assimp/kimkulling/remove_deprecated_readme_issue4505
Delete README
2022-04-28 10:41:37 +02:00
Kim Kulling 1a47f52eb8
Merge branch 'master' into kimkulling/remove_deprecated_readme_issue4505 2022-04-28 10:26:27 +02:00
Kim Kulling 92bdb993e9
Merge pull request #4507 from assimp/kimkulling/disable_ifc_curve_floating_assertion_issue4450
Disable assertion tests floating point against inf for Intel oneAPI
2022-04-28 10:26:13 +02:00
Kim Kulling 1ac9173e8c
Disable assertion tests floating point against inf for Intel oneAPI
- closes https://github.com/assimp/assimp/issues/4450
2022-04-28 10:08:01 +02:00
Kim Kulling 0b3232ce10
Delete README
- closes https://github.com/assimp/assimp/issues/4505
2022-04-28 09:22:02 +02:00
Kim Kulling 66cfe0cdf4
Merge pull request #4502 from assimp/kimkulling/out_of_range_access_error_issue4495
Fix out-of-range access in ASE-Parser
2022-04-27 20:33:06 +02:00
Kim Kulling 174b2fcf59
Fix invalid use of material reference. 2022-04-27 20:21:30 +02:00
Kim Kulling 37ec378b60
Fixx out-of-range access in ASE-Parser
- closes https://github.com/assimp/assimp/issues/4495
2022-04-27 19:52:23 +02:00
Kim Kulling 458a0314aa
Merge pull request #4501 from assimp/kimkulling-patch-1
Document fuzz folder
2022-04-27 15:34:36 +02:00
Kim Kulling 6c2f1378e3
Document fuzz folder
- closes https://github.com/assimp/assimp/issues/4497
2022-04-27 15:09:30 +02:00
Kim Kulling d3a8306f59
Merge pull request #4481 from hgdagon/master
Some Windows/MSYS2-specific fixes
2022-04-27 10:31:27 +02:00
Kim Kulling cce62fded1
Merge branch 'master' into master 2022-04-27 08:45:16 +02:00
Kim Kulling 88a9598ded
Merge pull request #4490 from Mykhailo418/master
FbxConverter: update bone mOffsetMatrix
2022-04-25 21:35:34 +02:00
Kim Kulling d14bff5a9f
Merge branch 'master' into master 2022-04-24 18:17:33 +02:00
Kim Kulling 02f070667a
Merge pull request #4483 from lgmcode/master
Fix draco building error when import assimp with cmake add_subdirectory #3663
2022-04-20 23:22:05 +02:00
Kim Kulling d6aa3db4ef
Merge branch 'master' into master 2022-04-20 21:59:17 +02:00
Kim Kulling 41fbc5e715
Merge pull request #4488 from HadesD/patch-1
Fix ogre xml serializer
2022-04-20 21:58:49 +02:00
Kim Kulling 7f913c180b
Merge branch 'master' into master 2022-04-19 15:23:09 +02:00
Mykhailo418 8a1dc87b4c remove absolute_transform in FBXConverter 2022-04-18 18:10:59 +03:00
Mykhailo418 e3def37f42 assing absolute_transform to matrix 2022-04-18 17:26:37 +03:00
Mykhailo418 863e3e0ccb FbxConverter, bone mOffsetMatrix update 2022-04-18 16:02:17 +03:00
Ichiro 9ab6ebd363
Fix foreach 2022-04-18 04:11:06 +09:00
Ichiro 128242e371
Fix ogre xml serializer 2022-04-18 01:28:03 +09:00
Kim Kulling b699d3a26a
Merge pull request #4440 from sacereda/obj-pbr-explicit
Avoid setting PBR properties when they are not found on mtl file
2022-04-13 10:11:53 +02:00
Kim Kulling aa814a522d
Merge branch 'master' into obj-pbr-explicit 2022-04-12 11:12:58 +02:00
Kim Kulling dc8ba61095
Merge pull request #4463 from jakrams/user/jakras/bitangent-fuzzer-fix
Prevent nullptr access to normals-array in bitangent computation
2022-04-12 11:10:47 +02:00
Kim Kulling ae9f5b6fc5
Merge branch 'master' into user/jakras/bitangent-fuzzer-fix 2022-04-12 10:41:43 +02:00
Kim Kulling 26e471ad62
Merge pull request #4454 from mpcarlos87/Android-Script-Update
Updated Android build script
2022-04-12 10:41:13 +02:00
Guangmo Lin 778ac976b2
Fix draco building error when import assimp with cmake add_subdirectory #3663 2022-04-11 15:08:20 +08:00
Kim Kulling 6943e59886
Merge branch 'master' into obj-pbr-explicit 2022-04-08 14:36:57 +02:00
hgdagon 518d50d2e6 Fixes for Windows/MSYS2 2022-04-07 03:07:57 -07:00
Carlos Martinez Perez 2bfb78f91d
Merge branch 'master' into Android-Script-Update 2022-04-03 12:25:04 +02:00
Kim Kulling 75ab2beb06
Merge pull request #4466 from ifiddynine/patch-3
Detect Roughness factor exported by Blender
2022-04-02 21:54:06 +02:00
Kim Kulling 88dadd6c40
Merge branch 'master' into patch-3 2022-04-02 11:22:33 +02:00
Kim Kulling 8109689dc2
Merge branch 'master' into Android-Script-Update 2022-04-01 14:57:47 +02:00
Kim Kulling 42adc82354
Merge pull request #4473 from xiaohunqupo/master
Fix compile error: When enable macro ASSIMP_DOUBLE_PRECISION
2022-03-31 18:35:07 +02:00
xiaohunqupo a050dee096 Fix compile error:When enable macro ASSIMP_DOUBLE_PRECISION 2022-03-31 16:08:39 +08:00
xiaohunqupo de6e90a657 Fix commit error 2022-03-31 15:36:57 +08:00
xiaohunqupo 2152aae2a3 Fix compile error due to namespace conflicts in VC140. 2022-03-31 15:34:49 +08:00
xiaohunqupo b08c04b87a Fix compile errro in VC140 2022-03-31 15:08:12 +08:00
xiaohunqupo cc515746f7 Fix v140 compile errror 2022-03-31 14:58:31 +08:00
Danny许 8e075ce713
Update ObjFileParser.cpp 2022-03-31 14:53:33 +08:00
Danny许 18c4ebaa13
Fix compile in VC140 2022-03-31 14:28:35 +08:00