Commit Graph

  • 0fef0e1101 Move duplicate code to glFT common header. Kim Kulling 2021-09-14 20:45:36 +02:00
  • 8ba4d30d7c Merge branch 'master' into x3d_pugi_migration_artenuvielle Kim Kulling 2021-09-14 08:24:44 +02:00
  • 002cdcdd7f Merge pull request #4081 from ingowald/master Kim Kulling 2021-09-14 08:24:08 +02:00
  • e9d03f3379 fixed wrong comment Ingo Wald 2021-09-13 15:10:48 -06:00
  • 18531e3677 Next iteration for c++11 features. Kim Kulling 2021-09-13 22:38:20 +02:00
  • c7e9c6580a Merge branch 'master' into x3d_pugi_migration_artenuvielle Artenuvielle 2021-09-12 11:45:00 +02:00
  • dfb0d66437 Merge branch 'master' into x3d_pugi_migration_artenuvielle René Martin 2021-09-12 11:44:14 +02:00
  • 3f6a371b64 migrated x3d importer to pugixml reader René Martin 2021-09-12 11:37:33 +02:00
  • 5895c0c22c more const in format detection Krishty 2021-09-11 23:23:05 +02:00
  • 4cf4e7454f removed useless code Krishty 2021-09-11 21:51:20 +02:00
  • 93edbe883f Use Safe Constants Idioms for ObjFileParser::DEFAULT_MATERIAL. Hill Ma 2021-09-10 11:00:21 -07:00
  • 0dabce2754 Merge branch 'master' into cleanup_public_header Kim Kulling 2021-09-09 20:18:01 +02:00
  • d34cd103f4 Merge pull request #4054 from kirillsurkov/master Kim Kulling 2021-09-09 09:39:24 +02:00
  • bc0a2762df Merge branch 'master' into master Kim Kulling 2021-09-09 09:16:50 +02:00
  • f47479aba4 Rework format + introdule missing C++11 features Kim Kulling 2021-09-08 23:18:13 +02:00
  • be0ab89afe Merge pull request #4070 from assimp/kimkulling-patch-1 Kim Kulling 2021-09-08 08:59:27 +02:00
  • dfd95633a4 Add patreon Kim Kulling 2021-09-08 08:31:33 +02:00
  • 9834dc7fc0 Merge pull request #4012 from Spectrum76/master Kim Kulling 2021-09-07 15:59:20 +02:00
  • 2acfdbe0c5 Merge branch 'master' into master Kim Kulling 2021-09-07 15:43:59 +02:00
  • 3001d88172 Merge branch 'master' into x3d_pugi_migration René Martin 2021-09-07 15:04:08 +02:00
  • e70b05b41a Merge pull request #4057 from Madrich/master Kim Kulling 2021-09-07 12:49:04 +02:00
  • 768024d5a0 Merge branch 'master' into master Kim Kulling 2021-09-07 11:39:34 +02:00
  • 30c6606718 Merge pull request #4056 from Dig-Doug/xgl-fix Kim Kulling 2021-09-07 10:12:40 +02:00
  • 74e8a6a366 Merge branch 'master' into xgl-fix Kim Kulling 2021-09-07 09:03:40 +02:00
  • 209167c41f Merge pull request #4055 from ms-maxvollmer/ms-maxvollmer/code_improvements Kim Kulling 2021-09-02 11:33:10 +02:00
  • bf8e36ae28 Fixed typo Max Vollmer (Microsoft Havok) 2021-09-02 10:07:28 +01:00
  • 72ea80b41f Revert last change (gltf2::Ref type is not a pointer and has a bool() operator) Max Vollmer (Microsoft Havok) 2021-09-02 10:00:56 +01:00
  • d710d0700f Make nullptr test more explicit. Kim Kulling 2021-09-02 10:10:42 +02:00
  • 4c86772091 Added another nullptr safety check Max Vollmer (Microsoft Havok) 2021-09-02 08:27:03 +01:00
  • 9b535d1c15 Fix Double Precision errors/warnings Madrich 2021-08-31 12:59:31 +02:00
  • 43a3c4a05e Merge branch 'assimp:master' into master Madrich 2021-08-31 11:55:29 +02:00
  • 155db25883 Merge branch 'master' into ms-maxvollmer/code_improvements Kim Kulling 2021-08-31 08:55:47 +02:00
  • f888910a2a Merge pull request #4053 from kovacsv/compressed_json Kim Kulling 2021-08-31 08:51:23 +02:00
  • 96f0787f51 Fix the -Werror=unused-but-set-parameter warning by removing the skipFirst variable. Doug Roeper 2021-08-30 18:15:37 -04:00
  • 51f294c587 Fixes issues our internal compliance and code quality tool found: Max Vollmer (Microsoft Havok) 2021-08-30 14:59:17 +01:00
  • 82d8c4e849 Merge branch 'master' into compressed_json Viktor Kovacs 2021-08-30 10:11:03 +02:00
  • 5e86fead8e Merge pull request #4029 from assimp/issue_3398 Kim Kulling 2021-08-30 08:46:33 +02:00
  • 38c611a02c Update ColladaLoader.cpp Kim Kulling 2021-08-30 08:33:35 +02:00
  • e2c2a60c45 Remove not used attribute Kim Kulling 2021-08-29 18:41:07 +02:00
  • c9d35b6edc Remove C++14 feature. Kim Kulling 2021-08-29 18:35:44 +02:00
  • ceafa95610 Remove unused header Kim Kulling 2021-08-29 10:36:02 +02:00
  • 5ca2cbb7ae Fix MinGW build kirillsurkov 2021-08-28 20:04:37 +03:00
  • c9b76f5255 Decrease xml-serializer complexity Kim Kulling 2021-08-28 14:20:12 +02:00
  • df739f00dd Merge branch 'master' into issue_3398 Kim Kulling 2021-08-28 13:56:50 +02:00
  • 69051bbc2c Add missing docu Kim Kulling 2021-08-28 13:46:41 +02:00
  • a7bc858698 Fix review finding. Kim Kulling 2021-08-28 13:36:57 +02:00
  • 3e090b21f5 Fix setup of embedded texture loading Kim Kulling 2021-08-28 13:33:25 +02:00
  • b9b62d106c Merge branch 'master' into compressed_json Viktor Kovacs 2021-08-27 18:18:28 +02:00
  • b39f38b73c Add export property for assimp json exporter to write compressed json (without whitespaces). kovacsv 2021-08-27 18:17:27 +02:00
  • 6841397798 Merge pull request #4051 from assimp/kimkulling-kill_irrXml-dependency Kim Kulling 2021-08-27 15:07:00 +02:00
  • 999192489c Delete FindIrrXML.cmake Kim Kulling 2021-08-27 14:52:48 +02:00
  • afd0f65ceb Merge pull request #4050 from assimp/kimkulling-fuzzer_issue_24553 Kim Kulling 2021-08-27 14:19:32 +02:00
  • a45878c41a Fix possible overrun Kim Kulling 2021-08-27 14:04:00 +02:00
  • e5bf7f7e07 Merge pull request #4049 from assimp/kimkulling-patch-fuzzer_Issue_25058 Kim Kulling 2021-08-27 11:01:49 +02:00
  • eabfc05bbb Handle empty keys Kim Kulling 2021-08-27 10:41:25 +02:00
  • 6439305379 Remove dead code Kim Kulling 2021-08-24 20:53:55 +02:00
  • 61ba320a04 Merge branch 'master' into master Kim Kulling 2021-08-24 20:53:04 +02:00
  • e7085199f2 Merge pull request #4045 from assimp/issue_4042 Kim Kulling 2021-08-24 19:37:18 +02:00
  • fe31ac295c Merge branch 'master' into issue_4042 Kim Kulling 2021-08-24 19:24:16 +02:00
  • a71baaeedf Enable Viewer only for VS-Builds Kim Kulling 2021-08-24 19:22:15 +02:00
  • 7cc076b27a Merge pull request #4044 from kovacsv/m3d_crash Kim Kulling 2021-08-24 15:06:50 +02:00
  • cb262dab5e Revert test back to the exact same version. kovacsv 2021-08-24 11:02:09 +02:00
  • 37ba067839 Revert back test, because the new one revealed an undefined behavior error. kovacsv 2021-08-24 09:09:35 +02:00
  • 0590a39159 Fix M3D import crash and memory leak. kovacsv 2021-08-24 07:26:20 +02:00
  • d2b7e9c38c Merge pull request #4040 from assimp/build_fixes Kim Kulling 2021-08-20 21:23:42 +02:00
  • f24101546b Fix typo in path Kim Kulling 2021-08-20 21:02:42 +02:00
  • 1452b33cbd Merge branch 'master' into build_fixes Kim Kulling 2021-08-20 20:58:35 +02:00
  • 18f58947a4 CMake: move hunter cmake-scripts into cmake-modules kimmi 2021-08-20 20:42:02 +02:00
  • 38dcd3583c Fix compiler warnings: comparison signed unsigned. kimmi 2021-08-20 20:20:47 +02:00
  • c396bc78b1 closes https://github.com/assimp/assimp/issues/3951: Use using directive to define type. kimmi 2021-08-20 19:40:04 +02:00
  • 7fa2bfbb70 Merge pull request #4036 from yzthr/master Kim Kulling 2021-08-20 19:30:37 +02:00
  • 21603c9f83 Merge branch 'master' into master Kim Kulling 2021-08-20 19:18:54 +02:00
  • aa90f51849 Merge pull request #4037 from kovacsv/master Kim Kulling 2021-08-19 19:48:12 +02:00
  • 468aa50aed mingw build fix kovacsv 2021-08-19 13:50:26 +02:00
  • d926c5ed61 fix sample build error 陶浩然 2021-08-19 18:49:43 +08:00
  • ceced70df0 Merge pull request #4026 from Mykhailo418/master Kim Kulling 2021-08-18 10:47:20 +02:00
  • f3903e34a4 Merge branch 'master' into master Kim Kulling 2021-08-18 07:32:16 +02:00
  • 4766d75943 Merge pull request #4027 from uerobert/clang13 Kim Kulling 2021-08-17 17:39:02 +02:00
  • a486a698e8 Merge branch 'master' into clang13 Kim Kulling 2021-08-16 21:35:59 +02:00
  • 4ce638838d Merge pull request #4032 from ms-maxvollmer/ms-maxvollmer/crash_fixes_08_2021 Kim Kulling 2021-08-16 21:35:12 +02:00
  • a850f312ac Merge branch 'master' into ms-maxvollmer/crash_fixes_08_2021 Kim Kulling 2021-08-16 21:00:07 +02:00
  • c28aab2ed6 Merge pull request #4017 from mahiuchun/bound Kim Kulling 2021-08-16 20:59:37 +02:00
  • 27231c3f52 Merge branch 'master' into bound Kim Kulling 2021-08-16 20:48:17 +02:00
  • 4caba7de8a Merge pull request #4010 from krishty/fix-logger-comments Kim Kulling 2021-08-16 20:47:31 +02:00
  • 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. Max Vollmer (Microsoft Havok) 2021-08-13 17:46:10 +01:00
  • de2f5cf021 Crash fixes Max Vollmer (Microsoft Havok) 2021-08-13 16:14:28 +01:00
  • 4d8c518ed0 Merge branch 'assimp:master' into master Spectrum76 2021-08-13 20:43:35 +05:30
  • 4b1ff645e3 closes https://github.com/assimp/assimp/issues/3398: Add support for embedded textures Kim Kulling 2021-08-12 21:13:07 +02:00
  • 26defda671 Merge branch 'master' into master Mykhailo Smoliakov 2021-08-12 08:20:59 +03:00
  • b95df54225 Remove unused code Robert Ubiñas 2021-08-11 19:33:10 -04:00
  • 58cae73401 Disable diagnostic for LogStream comparator Robert Ubiñas 2021-08-11 19:32:26 -04:00
  • 69c152d7c1 Add missing diagnostic push Robert Ubiñas 2021-08-11 18:57:21 -04:00
  • aac77e58b6 Merge branch 'master' into fix-logger-comments krishty 2021-08-11 12:16:58 +02:00
  • c3fcbfd2c1 Fix issue of incorrect reading of PBR properties such as base and emissive color in FBX Mykhailo Smoliakov 2021-08-11 08:54:34 +03:00
  • fcc7ad52a1 Merge pull request #4009 from krishty/fix-indent Kim Kulling 2021-08-11 00:35:08 +02:00
  • a16cd95b16 Merge branch 'master' into fix-indent Kim Kulling 2021-08-10 21:39:13 +02:00
  • 843e16868c Merge pull request #4008 from krishty/no-empty-string-literals Kim Kulling 2021-08-10 21:38:46 +02:00
  • a55518f6fc Merge branch 'master' into no-empty-string-literals Kim Kulling 2021-08-10 20:41:40 +02:00
  • 58f91000c8 Merge pull request #4007 from krishty/trim-trailing-whitespace Kim Kulling 2021-08-09 23:26:38 +02:00
  • 89eadb934f Merge branch 'master' into trim-trailing-whitespace Kim Kulling 2021-08-09 21:24:22 +02:00