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
Kim Kulling
4950d02bac
Merge pull request #4960 from shammellee/fix-pyassimp-readme-typo
...
Fix PyAssimp README typo
2023-02-15 21:22:16 +01:00
Kim Kulling
9898138516
Update mesh.h
2023-02-15 21:02:03 +01:00
Shammel Lee
4c723a4ec8
Fix PyAssimp README typo
2023-02-14 20:21:33 -05:00
Kim Kulling
bfa19f6900
Merge pull request #4946 from assimp/kimkulling/skeleton-doc
...
Add skeleton doc
2023-02-14 21:08:03 +01:00
Kim Kulling
779912e84e
Merge branch 'master' into kimkulling/skeleton-doc
2023-02-13 21:29:32 +01:00
Kim Kulling
bb9b583bcf
Merge pull request #4945 from jiannanya/MemoryIOStream-override-mark
...
the member 'Flush()' need to be marked as override for msvc clang compiling
2023-02-13 10:03:51 +01:00
Kim Kulling
156a393b84
Fix a typo
2023-02-10 08:07:09 +01:00
Kim Kulling
bde9a6a3c3
Update mesh.h
2023-02-09 22:36:06 +01:00
Kim Kulling
7b3f70a08b
Add skeleton doc
2023-02-09 21:12:21 +01:00
jiannanya
2390822baf
Fix: the member function 'Flush()' of class 'MemoryIOStream' need to be marked as override for msvc clang compiling
2023-02-09 21:30:48 +08:00
Kim Kulling
4cf1ee98f6
Merge pull request #4943 from assimp/kimkulling/fix_leak_issue-3416
...
Fix: Fix memleak when exiting method by exception
2023-02-08 22:18:01 +01:00
Kim Kulling
b7d08fc8f2
Fix review findings.
2023-02-08 21:48:55 +01:00
Kim Kulling
b170370e5c
Fix: Fix memleak when exiting method by exception
2023-02-08 21:29:54 +01:00
Kim Kulling
dd6bcecf56
Merge pull request #4941 from assimp/kimkulling/cleanup
...
Delete .coveralls.yml
2023-02-07 20:54:41 +01:00
Kim Kulling
0c05682baf
Delete .coveralls.yml
2023-02-07 20:02:06 +01:00
Kim Kulling
487c03f547
Merge pull request #4935 from IOBYTE/master
...
ACLoader: add support for reading more than one texture per object
2023-02-04 19:28:21 +01:00
Kim Kulling
839cd35a54
Merge branch 'master' into master
2023-02-04 19:08:39 +01:00
Kim Kulling
e6877cf20f
Merge pull request #4936 from TinyTinni/issue-4871
...
Fixes PLY reader when the header ends with \r\n
2023-02-04 19:08:12 +01:00
Kim Kulling
e9c95d484e
Update IOStreamBuffer.h
2023-02-04 18:36:36 +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
Kim Kulling
8c6b3fe69a
Merge pull request #4934 from turol/terragen_fix
...
Fix Terragen loader
2023-02-03 11:42:15 +01:00
Turo Lamminen
9453342491
Re-enable Terragen loader unit test
2023-02-03 11:45:11 +02:00
Turo Lamminen
8d405d60d9
Fix Terragen loader
...
Fixes e8d2b84017
2023-02-03 11:44:27 +02:00
Kim Kulling
dbd0ae8f22
Merge pull request #4932 from turol/unit-test-fix
...
Unit test warning fixes
2023-02-03 00:15:48 +01:00
Kim Kulling
14b80f1ac4
Merge branch 'master' into unit-test-fix
2023-02-02 22:05:38 +01:00
Kim Kulling
ea7321aae2
Merge pull request #4898 from shaunrd0/zlib-nobuild
...
Don't build zlib if ASSIMP_BUILD_ZLIB=OFF
2023-02-02 20:45:02 +01:00
Turo Lamminen
a2273df48e
Unit test warning fixes
...
GCC was warning about possibly uninitialized variables. Initialize them
and use values which are nonzero and distinct from each other and any
real value passed to any set method. This should prevent any false positives
from zero initialization.
2023-02-02 14:07:16 +02:00
Kim Kulling
213b536282
Merge branch 'master' into zlib-nobuild
2023-02-01 20:24:41 +01:00
Kim Kulling
6999caa683
Merge pull request #4899 from PencilAmazing/PLYcomments#4866
...
Fix issue #4866 by continuing to resetting read loop after hitting a comment
2023-02-01 20:06:59 +01:00
PencilAmazing
feb3e9ff7a
Merge branch 'master' into PLYcomments#4866
2023-02-01 13:05:55 -05:00
Kim Kulling
ce2f947eb1
Merge branch 'master' into zlib-nobuild
2023-01-31 22:00:49 +01:00
Kim Kulling
b55e29b915
Merge pull request #4901 from AdamCichocki/JoinVerticesProcessUsedVerticesMask
...
Optimized usedVertexIndices in JoinVerticesProcess by using bitmask instead of unordered_set
2023-01-31 21:25:46 +01:00
