Commit Graph

1217 Commits

Author SHA1 Message Date
Jackie9527
a87585668d Fix warning related to unreachable-code-return, disable warning.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-05 07:37:48 +08:00
Kim Kulling
89ccc89298 Merge branch 'master' into fix_pretransform_vertices_with_cameras 2023-04-04 17:21:05 +02:00
Kim Kulling
1733d9f795 Merge branch 'master' into msvc-clang-unreachable-code 2023-04-04 17:02:22 +02:00
Kim Kulling
a259277498 Merge branch 'master' into master 2023-04-03 23:54:28 +02:00
Suhajda Tamás
9915e875bf glTF2: Fix incorrect camera position 2023-04-03 23:35:04 +02:00
Kim Kulling
8aa959fa19 Merge branch 'master' into MemoryOptimizationForGLTFWithSharedAttr 2023-04-03 20:48:51 +02:00
Kim Kulling
d6885d4025 Merge branch 'master' into msvc-clang-nested-anon-types 2023-04-03 19:59:59 +02:00
Kim Kulling
19ff57a6c3 Merge branch 'master' into MemoryOptimizationForGLTFWithSharedAttr 2023-04-03 11:28:10 +02:00
Jackie9527
04066ece8e Fix warning related to unreachable-code.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 13:02:04 +08:00
Jackie9527
1dcb5da1cd Fix warning related to unreachable-code.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 13:01:22 +08:00
Jackie9527
6b54761310 Fix warning related to nested-anon-types.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 10:30:10 +08:00
aniongithub
4438b3ecc9 Fix Issue #4486 using the fix described by @jianliang79 2023-03-29 18:36:18 +00:00
inhosens
7095c4f52f Merge branch 'master' into master 2023-03-23 07:30:49 +01:00
Turo Lamminen
5ddd18d1c7 Add more AMF unit tests 2023-03-22 12:06:30 +02:00
inhosens
7cc0c06fdb Merge branch 'assimp:master' into master 2023-03-22 08:30:52 +01:00
Inho Lee
cdfdd75a66 FBXConverter : import FbxCamera correctly
FbxCamera's default value is correct but its transformed
values are described in each NodeProperties.
2023-03-21 10:35:24 +01:00
Kim Kulling
e7e4e3100f Merge branch 'master' into 1-3193 2023-03-20 14:01:35 +01:00
Turo Lamminen
3a69e353f3 Make Blender MVert no field optional 2023-03-20 12:00:20 +02:00
Marc-Antoine Lortie
eb3b48e523 Invert logic in build_bone_children_hierarchy. 2023-03-14 09:21:45 -04:00
Marc-Antoine Lortie
4c015077b8 Add missing member initializer. 2023-03-13 19:07:14 -04:00
Marc-Antoine Lortie
054dacd068 Improved comments. 2023-03-13 19:07:14 -04:00
Marc-Antoine Lortie
4b4cb55f22 Fix HL1MDLLoader flattened bone hierarchy. 2023-03-13 19:06:18 -04:00
Florian Born
8176c6a0e4 Adjusting the unit tests to pass new gltf 2023-03-10 18:36:43 +01:00
Florian Born
60cefdd549 Jan's fedback 2023-03-10 12:10:38 +01:00
Florian Born
dfd70b5c10 GLTF Importer: Build a list of the actual vertices so it works well with shared attribute lists 2023-03-09 19:06:58 +01:00
Kim Kulling
05249353d4 Merge branch 'master' into UseNewMetaDataTypesInFBXConverter 2023-03-08 10:53:00 +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
44c2785663 Make debug message more professional. 2023-03-07 17:01:08 +01:00
Urs Hanselmann
2efd48dee2 disable another debug print message 2023-03-04 14:53:48 +01:00
Jackie9527
424f53b4d6 bugfix remove duplicated data.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-03-04 16:25:56 +08: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
Kim Kulling
eb73464055 Merge branch 'master' into fix-fbx-document-duplicate-id-leak 2023-02-23 10:39:52 +01:00
Kim Kulling
c8d50dc83f Merge branch 'master' into patch-2 2023-02-22 21:33:20 +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
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
839cd35a54 Merge branch 'master' into master 2023-02-04 19:08:39 +01:00
Matthias Möller
db72c6ee38 When "getNextBlock" was called after "getNextLine", the pointer could still on the newline.
The pointer to a newline could not advance enough, when the line ended with \r\n. The resulting buffer was correct, as the buffer range went from <start> until \r, but that the pointer increased by just 1 could lead to the problem that the next pointer points at \n, which is still part of the newline and therefore, "getNextBlock" got 1 byte too much.

Refs Issue #4871
2023-02-04 15:16:22 +01:00
Robert Reif
88ef9eecc1 ACLoader: add support for reading more than one texture per object 2023-02-03 20:29:56 -05:00
Turo Lamminen
8d405d60d9 Fix Terragen loader
Fixes e8d2b84017
2023-02-03 11:44:27 +02:00
PencilAmazing
feb3e9ff7a Merge branch 'master' into PLYcomments#4866 2023-02-01 13:05:55 -05:00