cc2c5d3ae3
Merge branch 'master' into collada-ignore-unit-size-property
2023-08-29 14:01:40 +02:00
2f6f58707d
Merge pull request #5161 from malytomas/master
...
fix incorrect default for material::get with aiColor3D
2023-08-28 11:45:54 +02:00
b9ea538e6f
Merge branch 'master' into master
2023-08-28 11:11:50 +02:00
80a03071ba
Merge pull request #5209 from sashashura/openddlparser
...
bump openddl-parser to v0.5.1
2023-08-25 00:00:39 +02:00
fa69c47d45
Merge branch 'master' into openddlparser
2023-08-24 23:46:23 +02:00
fe6730f225
Merge pull request #5212 from guguTang/xin-issue_5211
...
Ensure that the strength attribute is the same when importing or exporting gltf2
2023-08-24 23:45:41 +02:00
60b6d80936
Merge branch 'master' into xin-issue_5211
2023-08-24 21:03:57 +02:00
c953c9b76f
Merge pull request #5213 from AnyOldName3/pdb-install-fixes
...
Use correct PDB paths
2023-08-24 20:35:00 +02:00
e50233b2c1
Use correct PDB paths
...
The previously-specified paths were only correct for a static library
build.
I therefore fenced off that code to be specific to static library
builds.
For shared library builds, I added a generator-expression-based
alternative.
Annoyingly, this won't work with static library builds, so we don't get
the concise, reliable version in all circumstances.
I've avoided modifying any of the paths anything ends up at to avoid
breaking changes.
Resolves https://github.com/assimp/assimp/issues/4269
2023-08-23 17:19:01 +01:00
4389c3d80c
The texture strength attribute in aiMaterial set when importing and exporting gltf files is inconsistent
2023-08-23 14:54:40 +08:00
081cae6a95
Fix WIN32_LEAN_AND_MEAN redefinition
2023-08-17 13:25:30 +00:00
7cbf4c4136
Fix win build
2023-08-17 12:35:44 +00:00
bc7ef58b49
bump openddl-parser to v0.5.1
2023-08-17 12:00:22 +00:00
72c10d856f
Merge pull request #5207 from sashashura/4658377717055488
...
Fix Invalid-free in Assimp::FBX::Scope::Scope
2023-08-17 10:27:36 +02:00
5c45cdc0ad
Fix Invalid-free in Assimp::FBX::Scope::Scope
2023-08-16 07:45:23 +00:00
3a02de4d28
Merge pull request #5194 from Gargaj/floatwarn
...
Fix warning-as-error
2023-08-15 16:53:36 +02:00
d77903423f
Merge branch 'master' into floatwarn
2023-08-15 12:55:37 +02:00
556c89b5f1
Merge pull request #5199 from sashashura/5513536726761472
...
Fix UNKNOWN READ in std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<ch
2023-08-12 08:20:15 +02:00
e5d9339c21
Merge branch 'master' into 5513536726761472
2023-08-12 08:05:27 +02:00
461601e9ff
Merge pull request #5174 from feuerste/fix_magic
...
Fix violation of strict aliasing rule in `BaseImporter::CheckMagicToken`.
2023-08-12 08:04:34 +02:00
1c5dc86afb
Merge branch 'master' into fix_magic
2023-08-12 07:39:40 +02:00
d8a7399a04
Merge branch 'assimp:master' into collada-ignore-unit-size-property
2023-08-10 08:10:18 +02:00
df9c5cdb9f
Merge pull request #5191 from sashashura/823345681268736
...
Fix UNKNOWN READ in Assimp::MDLImporter::InternReadFile_Quake1
2023-08-09 21:17:15 +02:00
79dcc289d0
Merge branch 'master' into 823345681268736
2023-08-09 20:58:56 +02:00
aa5b41446c
Merge pull request #5200 from paroj/master
...
Be more precise regarding index buffer
2023-08-09 20:09:17 +02:00
20a2cc4c94
it is the importer, not the postproc
2023-08-09 02:05:44 +02:00
2baadf2fe5
Be more precise regarding index buffer
2023-08-08 18:34:13 +02:00
b9460dd959
Fix UNKNOWN READ in std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<ch
2023-08-08 16:01:00 +00:00
49ed0711d1
Fix another warning
2023-08-05 15:43:31 +02:00
8312b31d27
fix warning-as-error
2023-08-05 15:39:47 +02:00
bb1873dd22
Collada: added import property to disable unit size scaling
2023-08-04 09:54:55 +02:00
f7e7f82b9d
Add const
2023-08-03 17:10:17 +00:00
d7dc88e0d0
Fix UNKNOWN READ in Assimp::MDLImporter::InternReadFile_Quake1
2023-08-01 13:04:16 +00:00
60989a598e
Merge pull request #5175 from sfjohnston/sfjohnston_mods
...
Bug fix and improvement to FBX camera field-of-view during import.
2023-07-23 21:31:39 +02:00
439b3369c1
Merge branch 'master' into fix_magic
2023-07-23 21:21:29 +02:00
dd40b0ccee
Changed #define FBX_FOV_UNKNOWN to const float kFovUnknown
2023-07-23 12:05:01 -07:00
3ec8a36764
Merge branch 'assimp:master' into sfjohnston_mods
2023-07-23 08:37:47 -07:00
131bc61d47
Merge pull request #5186 from feuerste/missing_header
...
Add missing rapidjson headers to `glTF2Asset.inl`.
2023-07-23 13:51:01 +02:00
d05dbfa8c9
Merge branch 'master' into missing_header
2023-07-23 13:29:56 +02:00
20cb815290
Merge pull request #5188 from assimp/kimkulling/remove_deprecated_swig_files
...
Remove deprecated swig files.
2023-07-23 13:29:43 +02:00
0ab7de70cd
Remove deprecated swig files.
2023-07-23 12:49:25 +02:00
37a1366fb7
Add missing rapidjson headers.
2023-07-21 11:33:06 +02:00
52e5c3f39e
Fix violation of strict aliasing rule.
2023-07-21 09:48:45 +02:00
64e0ba2625
Merge branch 'master' into sfjohnston_mods
2023-07-20 09:21:13 +00:00
bf7ccb6206
Merge pull request #5182 from tellypresence/fix_malformed_irr_files
...
Fix malformed irr files
2023-07-18 14:29:08 +00:00
a5a4090989
Merge branch 'master' into fix_malformed_irr_files
2023-07-18 12:31:44 +00:00
8c871ed4f0
Merge pull request #5183 from SirLynix/patch-2
...
Remove /WX from CMakeLists for MSVC
2023-07-17 17:05:16 +02:00
46be2d3380
Remove /WX from CMakeLists for MSVC
2023-07-15 15:54:15 +02:00
ca7f6de671
Merge branch 'master' into fix_malformed_irr_files
2023-07-14 20:40:56 -07:00
3161f0e754
Introduce alternate versions with animations disabled to allow sucessful load
2023-07-14 20:19:28 -07:00
Kim Kulling
AnyOldName3
tangxin
Alex
Martin Weber
Pavel Rojtberg
Gargaj
sfjohnston
Kim Kulling
Marco Feuerstein
Jérôme Leclercq
Steve M
Steve M