Kim Kulling
8c9580cfd3
Merge branch 'master' into UseNewMetaDataTypesInFBXConverter
2023-03-07 21:32:37 +01:00
Kim Kulling
3a73ce37e4
Merge pull request #4986 from assimp/kimkulling/fix_sample_utf8_encoding
...
Fix: Use C++17 compliant utf8 encoding.
2023-03-07 19:27:06 +01:00
Kim Kulling
4f48348af8
Fix: Move c++ include to c++ section
2023-03-07 18:55:18 +01:00
Florian Born
069b3ecdf8
After Kim's addition to meta data types, use it in the FBX converter
2023-03-07 17:44:48 +01:00
Kim Kulling
5082c940d0
Fix: Replace back_inserter usage.
2023-03-06 21:13:40 +01:00
Kim Kulling
8171e041fa
Update utf82utf16.
2023-03-06 20:56:09 +01:00
Kim Kulling
c089f11768
Update utf82utf16.
2023-03-06 19:56:11 +01:00
Kim Kulling
7916f87404
Merge branch 'master' into kimkulling/fix_sample_utf8_encoding
2023-03-02 23:35:54 +01:00
Kim Kulling
6ed433d011
Merge pull request #4989 from Jackie9527/SimpleTexturedDirectx11-build-error-with-VS2022
...
Fix build error when building SimpleTexturedDirectx11 with VS2022.
2023-03-01 22:21:33 +01:00
Kim Kulling
b82c193dfd
Merge branch 'kimkulling/fix_sample_utf8_encoding' of https://github.com/assimp/assimp into kimkulling/fix_sample_utf8_encoding
2023-03-01 21:41:28 +01:00
Kim Kulling
1092f0d94e
Fix:Use correct encoding
2023-03-01 21:40:45 +01:00
Jackie9527
09dd0d0c2e
Fix build error when building SimpleTexturedDirectx11 with VS2022.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-03-01 15:08:02 +08:00
Kim Kulling
534ee288c5
Update UTFConverter.h
2023-02-28 23:28:24 +01:00
Kim Kulling
60da5e7e96
Update UTFConverter.cpp
2023-02-28 23:27:46 +01:00
Kim Kulling
7f2760fe2f
Merge branch 'master' into kimkulling/fix_sample_utf8_encoding
2023-02-28 21:54:35 +01:00
Kim Kulling
a1aace74e5
Fix: Use C++17 compliant utf8 encoding.
2023-02-28 21:53:18 +01:00
Kim Kulling
90333340d6
Merge pull request #4977 from turol/lwo-fixes
...
LWO fixes
2023-02-27 16:10:27 +01:00
Turo Lamminen
e8f0eb930d
Fix loading binary LWO files
2023-02-24 14:40:27 +02:00
Turo Lamminen
3bdc43a216
Add debug logging to LWO node graph generation
2023-02-24 14:40:27 +02:00
Turo Lamminen
657c1d8ad0
Use unique_ptr to store pivot nodes until moved to mapPivot
2023-02-24 14:40:23 +02:00
Turo Lamminen
3bdfecb0ed
Destroy mapPivot nodes as we go
2023-02-24 13:26:34 +02:00
Turo Lamminen
be28f0949b
Whitespace
2023-02-24 13:20:40 +02:00
Turo Lamminen
53c6cc0966
Add a scope so mapPivot is destroyed when no longer used
2023-02-24 13:19:38 +02:00
Turo Lamminen
92f7c50c91
Remove dead code
2023-02-24 13:18:04 +02:00
Turo Lamminen
28d4e394c0
Use std::unique_ptr a bit
2023-02-24 13:17:32 +02:00
Turo Lamminen
bb5a6abae0
Add more LWO files to unit tests
2023-02-24 12:43:06 +02:00
Kim Kulling
46ae8534f7
Merge pull request #4963 from avaneyev/fix-fbx-document-duplicate-id-leak
...
Fix a leak in FBXDocument when duplicate object IDs are found
2023-02-23 10:53:40 +01:00
Kim Kulling
eb73464055
Merge branch 'master' into fix-fbx-document-duplicate-id-leak
2023-02-23 10:39:52 +01:00
Kim Kulling
a14696b9ec
Merge pull request #4940 from ockeymm123/master
...
fix regression in join vertices post process.
2023-02-23 10:39:09 +01:00
Kim Kulling
2c3d52a5a1
Merge branch 'master' into master
2023-02-23 10:15:07 +01:00
Kim Kulling
408c41d687
Merge pull request #4971 from mjunix/patch-2
...
Fix index out of bounds
2023-02-22 21:47:01 +01:00
Kim Kulling
c8d50dc83f
Merge branch 'master' into patch-2
2023-02-22 21:33:20 +01:00
Kim Kulling
27225fadc1
Merge pull request #4970 from mjunix/patch-1
...
Fix index out of bounds
2023-02-22 21:32:56 +01:00
Kim Kulling
4d6b7ff8b4
Merge branch 'master' into patch-1
2023-02-22 20:35:47 +01:00
Kim Kulling
277e19106a
Merge pull request #4974 from assimp/kimkulling/fix_minor_typo_in_doc_issue-4973
...
Fix: Fix typo in doc
2023-02-22 09:38:16 +01:00
Kim Kulling
009cd6c64a
Merge branch 'master' into patch-2
2023-02-21 21:35:56 +01:00
Kim Kulling
6aac7a2458
Fix: Fix typo in doc
...
- closes https://github.com/assimp/assimp/issues/4973
2023-02-21 21:34:49 +01:00
Turo Lamminen
2d448616d0
Move string definitions into conditional block to fix unused variable warnings
2023-02-21 12:49:39 +02:00
Kim Kulling
7de21694e9
Merge pull request #4962 from assimp/kimkulling/skeleton_update_doc
...
Update mesh.h
2023-02-21 10:04:34 +01:00
Kim Kulling
65b0553b8d
Merge branch 'master' into kimkulling/skeleton_update_doc
2023-02-21 09:50:27 +01:00
Johan Mattsson
fa4273ee1f
Fix index out of bounds
2023-02-20 19:56:57 +01:00
Johan Mattsson
f8132bf17c
Fix index out of bounds
2023-02-20 19:50:06 +01:00
Kim Kulling
ad2f0682e7
Merge pull request #4965 from aaronmjacobs/implicit-conversion-fixes
...
Fix implicit conversion errors on macOS
2023-02-19 20:18:45 +01:00
Kim Kulling
1f0bcdf54c
Merge branch 'master' into implicit-conversion-fixes
2023-02-19 16:00:54 +01:00
Kim Kulling
c8a0119e45
Merge pull request #4967 from assimp/kimkulling/add_missing_metadatatypes_issue-4959
...
Add missing pod types.
2023-02-19 16:00:40 +01:00
Kim Kulling
3ad67771fe
Add missing pod types.
2023-02-18 17:09:14 +01:00
Aaron Jacobs
53e5f19b14
Use C++ style casts
2023-02-17 11:20:00 -08:00
Aaron Jacobs
e4386d3013
Fix implicit conversion errors on macOS
2023-02-16 15:21:43 -08:00
Anton Vaneev
2cd3da4831
Fix a leak in FBXDocument when duplicate object IDs are found
...
When a duplicate ID is encountered, existing LazyObject is overwritten. Previously allocated instance leaks.
This change deletes the previously allocated instance before overwriting the pointer.
2023-02-16 11:21:29 +01:00
Kim Kulling
3585dd577d
Fix: Add default parameter to constructor/destructor.
2023-02-16 11:19:23 +01:00