Commit Graph

11109 Commits

Author SHA1 Message Date
hgdagon
7338833f3b Merge branch 'master' into assimp_viewer 2022-05-07 18:04:18 +04:00
Kim Kulling
25118d230e Merge pull request #4509 from hgdagon/assimp_warnings_as_errors
Add an option to treat warnings as errors
2022-05-06 19:41:06 +02:00
Kim Kulling
39f5b723f3 Merge branch 'master' into assimp_warnings_as_errors 2022-05-06 19:28:17 +02:00
Kim Kulling
1f68f66162 Merge pull request #4514 from ALittleStardust/master
Update pugixml dependency to  v1.12.1
2022-05-06 13:43:58 +02:00
ALittleStardust
7bda8b7a77 Updated pugixml to version 1.12.1 2022-05-06 13:39:05 +07:00
hgdagon
1c2caec2bd Reverted copyright text back to static text
Windres handles it just fine, with the intended result, but RC doesn't seem to like it.
2022-05-03 14:45:24 -07:00
hgdagon
26ab3ce480 Update assimp_view.rc
Removed dead link and updated copyright string in the About dialog.
2022-05-03 14:16:51 -07:00
hgdagon
e59326a738 Merge branch 'master' into assimp_viewer 2022-05-04 00:44:53 +04:00
hgdagon
936cc791f2 Move ASSIMP_WARNINGS_AS_ERRORS check 2022-05-03 13:01:20 -07:00
hgdagon
e1f0f50010 Update CMakeLists.txt 2022-05-03 12:57:45 -07:00
hgdagon
18bfbaeee1 Actually set ASSIMP_WARNINGS_AS_ERRORS to ON by default
Whoops....
2022-05-03 12:31:09 -07:00
hgdagon
e97e7574ae Merge branch 'master' into assimp_warnings_as_errors 2022-05-03 23:24:52 +04:00
hgdagon
4faae3d0e9 Updated build options in Build.md 2022-05-03 12:24:34 -07:00
hgdagon
209c302f56 Merged ASSIMP_WARNINGS_AS_ERRORS and ASSIMP_WARNINGS_MAX
And set it ON by default.
2022-05-03 12:23:33 -07: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
f4b1a23010 Merge branch 'master' into assimp_viewer 2022-05-03 17:18:05 +02:00
Kim Kulling
bfb46ca5ef Fix protocol type. 2022-05-03 17:16:25 +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
hgdagon
bf32c4c408 Fixed ASSIMP_WARNINGS_MAX reference 2022-04-30 08:40:48 -07:00
U-DESKTOP-0R560PH\George
a7e2b3ad30 Fixed library names for MinGW/MSYS2 2022-04-30 08:14:16 -07:00
U-DESKTOP-0R560PH\George
63183a048c Minor updates to ASSIMP Viewer 2022-04-30 08:10:47 -07:00
U-DESKTOP-0R560PH\George
694dc8a0c3 Add an option to treat warnings as errors 2022-04-30 08:08:34 -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