Commit Graph

10700 Commits (38382715f78d6b91c7e8db88cb002f80d92a56a8)

Author SHA1 Message Date
Kim Kulling 4766d75943
Merge pull request #4027 from uerobert/clang13
Add missing diagnostic pragmas and remove unused code
2021-08-17 17:39:02 +02:00
Kim Kulling a486a698e8
Merge branch 'master' into clang13 2021-08-16 21:35:59 +02:00
Kim Kulling 4ce638838d
Merge pull request #4032 from ms-maxvollmer/ms-maxvollmer/crash_fixes_08_2021
Crash fixes
2021-08-16 21:35:12 +02:00
Kim Kulling a850f312ac
Merge branch 'master' into ms-maxvollmer/crash_fixes_08_2021 2021-08-16 21:00:07 +02:00
Kim Kulling c28aab2ed6
Merge pull request #4017 from mahiuchun/bound
Obj: make a predicate more robust.
2021-08-16 20:59:37 +02:00
Kim Kulling 27231c3f52
Merge branch 'master' into bound 2021-08-16 20:48:17 +02:00
Kim Kulling 4caba7de8a
Merge pull request #4010 from krishty/fix-logger-comments
fix comments
2021-08-16 20:47:31 +02:00
Max Vollmer (Microsoft Havok) c1e830cf3b The GLTF2 specs aren't very specific about the restrictions of the number of keyframes in sampler input and output. It seems logical that they should be the same, but there is an official sample model from Khronos where output has more keyframes. I thus assume that the GLTF2 standard allows more keyframes in output, but not in input. Fixed the check accordingly. 2021-08-13 17:46:10 +01:00
Max Vollmer (Microsoft Havok) de2f5cf021 Crash fixes 2021-08-13 16:26:42 +01:00
Spectrum76 4d8c518ed0
Merge branch 'assimp:master' into master 2021-08-13 20:43:35 +05:30
Kim Kulling 4b1ff645e3 closes https://github.com/assimp/assimp/issues/3398: Add support for embedded textures 2021-08-12 21:13:07 +02:00
Mykhailo Smoliakov 26defda671
Merge branch 'master' into master 2021-08-12 08:20:59 +03:00
Robert Ubiñas b95df54225 Remove unused code 2021-08-11 19:33:10 -04:00
Robert Ubiñas 58cae73401 Disable diagnostic for LogStream comparator 2021-08-11 19:32:26 -04:00
Robert Ubiñas 69c152d7c1 Add missing diagnostic push 2021-08-11 18:57:21 -04:00
krishty aac77e58b6
Merge branch 'master' into fix-logger-comments 2021-08-11 12:16:58 +02:00
Mykhailo Smoliakov c3fcbfd2c1 Fix issue of incorrect reading of PBR properties such as base and emissive color in FBX 2021-08-11 08:54:34 +03:00
Kim Kulling fcc7ad52a1
Merge pull request #4009 from krishty/fix-indent
style fix: indentation
2021-08-11 00:35:08 +02:00
Kim Kulling a16cd95b16
Merge branch 'master' into fix-indent 2021-08-10 21:39:13 +02:00
Kim Kulling 843e16868c
Merge pull request #4008 from krishty/no-empty-string-literals
style fix – initializing and assigning empty std::string properly
2021-08-10 21:38:46 +02:00
Kim Kulling a55518f6fc
Merge branch 'master' into no-empty-string-literals 2021-08-10 20:41:40 +02:00
Kim Kulling 58f91000c8
Merge pull request #4007 from krishty/trim-trailing-whitespace
removed trailing spaces and tabs from source and text
2021-08-09 23:26:38 +02:00
Kim Kulling 89eadb934f
Merge branch 'master' into trim-trailing-whitespace 2021-08-09 21:24:22 +02:00
Kim Kulling 89d17d1ea8
Merge pull request #4001 from xiaohunqupo/master
StepExporter support polygon mesh
2021-08-09 21:23:51 +02:00
Kim Kulling 0aa36ee550
Merge branch 'master' into master 2021-08-07 12:06:23 +02:00
krishty 73b25d2578
Merge branch 'master' into fix-logger-comments 2021-08-06 09:40:35 +02:00
krishty f8fe3d1341
Merge branch 'master' into fix-indent 2021-08-06 09:40:34 +02:00
krishty 00b22d1397
Merge branch 'master' into no-empty-string-literals 2021-08-06 09:40:31 +02:00
krishty 6cb54d1c95
Merge branch 'master' into trim-trailing-whitespace 2021-08-06 09:40:03 +02:00
Kim Kulling 76e3092b2a
Merge pull request #4016 from mahiuchun/strlen
Use strlen() rather than fixed length in fast_atof.h
2021-08-04 08:45:18 +02:00
Kim Kulling d09d7a9e13
Merge branch 'master' into strlen 2021-08-03 21:40:35 +02:00
Kim Kulling 87d53ce0cb
Merge pull request #4006 from krishty/remove-dead-code
removed useless code
2021-08-03 21:36:46 +02:00
Hill Ma 538cb3125c Use strlen() rather than fixed length in fast_atof.h
This avoids reading past the length of the input string.
2021-08-02 13:21:07 -07:00
Hill Ma 8d6d6b48c3 Obj: make a predicate more robust.
Since we might encounter invalid input it is a good idea to check the actual
size of the array.
2021-08-02 12:04:15 -07:00
Spectrum76 bd2067fa8a
Merge branch 'master' into master 2021-08-02 12:07:17 +05:30
krishty 1ee2be8c5c
Merge branch 'master' into trim-trailing-whitespace 2021-07-31 18:01:48 +02:00
Kim Kulling 00a2cd20f9
Merge branch 'master' into remove-dead-code 2021-07-31 17:00:58 +02:00
Kim Kulling 8f02c29023
Merge pull request #4011 from krishty/more-range-based-for
more range-based for
2021-07-31 16:59:49 +02:00
Spectrum76 6ce5248931
Update .gitignore 2021-07-29 21:38:23 +05:30
Krishty bb53961fa9 more range-based for
f6b4370f6a and 7c822f23bd introduced raw loops on data types with heavy nesting; range-based for suits better here
2021-07-29 14:57:25 +02:00
Krishty a1eaaaa0e3 fix comments
fixes some copy-paste errors in logger comments introduced with 89584c167a
2021-07-29 14:45:39 +02:00
Krishty 42a7611f85 style fix: indentation 2021-07-29 14:39:22 +02:00
Krishty 4991f728c8 style fix – initializing and assigning empty std::string properly
for details, see #3764
2021-07-29 14:23:52 +02:00
Krishty 758116b083 removed trailing spaces and tabs from source and text
This commit ignores the “contrib” folder in order to prevent merge conflicts in dependencies, should these be updated via git.
2021-07-29 13:28:51 +02:00
Krishty 738c31c3ea removed useless code
Found while reviewing #3880
2021-07-28 16:48:53 +02:00
xiaohunqupo d065513e27
Merge branch 'master' into master 2021-07-28 17:02:28 +08:00
Kim Kulling fc22d6cdae
Merge pull request #4002 from assimp/kimkulling-issue_3760
Fix Issue3760
2021-07-28 10:58:52 +02:00
Kim Kulling f87550fdbc
Fix Issue3760
- Convert left-handed coordinate system to right-handed coordinate system
- Rescale model by 0.01
- closes https://github.com/assimp/assimp/issues/3760
2021-07-28 10:39:39 +02:00
xiaohunqupo 8ee2c721d9
StepExporter support polygon mesh
StepExporter support polygon mesh
2021-07-28 16:32:27 +08:00
xiaohunqupo 9923cd0e06
Merge pull request #3 from assimp/master
Merge Master Branch To My Branch
2021-07-28 16:17:51 +08:00