Commit Graph

  • b2ab3fa35e Merge branch 'master' into ModellerMetaData Kim Kulling 2019-12-06 21:19:29 +01:00
  • 6d71921a2f Merge pull request #2802 from RichardTea/remove-cout-2797 Gordon MacPherson 2019-12-06 19:52:56 +00:00
  • a2f8c84c6c Fix deletion issue in aiMetadata::Add. Malcolm Tyrrell 2019-12-05 17:06:28 +00:00
  • 24f0a400b7 Extra comments. Malcolm Tyrrell 2019-12-05 15:11:46 +00:00
  • 8956e567b2 Better comment. Malcolm Tyrrell 2019-12-05 14:09:36 +00:00
  • 6639d5180b Add a test for gltf2 and FBX metadata. Malcolm Tyrrell 2019-12-05 14:05:49 +00:00
  • 81984002d3 Fix and test for GLTF. Malcolm Tyrrell 2019-12-05 13:52:34 +00:00
  • fabfcf3cb0 More checking Malcolm Tyrrell 2019-12-05 11:37:22 +00:00
  • 894b8e3519 Initial version Malcolm Tyrrell 2019-12-05 11:25:12 +00:00
  • 505769935e Merge branch 'master' into remove-cout-2797 Gordon MacPherson 2019-12-04 22:38:50 +00:00
  • a29e407853 Update B3DImporter.cpp Kim Kulling 2019-12-04 21:25:17 +01:00
  • fadf4a3ee2 Update M3DWrapper.h RichardTea 2019-12-04 14:05:46 +00:00
  • d8608156d3 Merge branch 'master' into partial-cleanup-m3d RichardTea 2019-12-04 14:00:33 +00:00
  • 81cb2433bc Merge pull request #2779 from turbosquid/fix_gltf_accessor_overflow Gordon MacPherson 2019-12-04 13:43:38 +00:00
  • bdb89413bc Merge branch 'master' into fix_gltf_accessor_overflow Gordon MacPherson 2019-12-03 22:20:19 +00:00
  • b10b8b2f1e Merge branch 'master' into warning-level-max Kim Kulling 2019-12-03 21:57:04 +01:00
  • a8c251fa37 Merge pull request #2769 from muxanickms/preserve_error_string Kim Kulling 2019-12-03 20:28:37 +01:00
  • 4a29cc7fcb Merge branch 'master' into partial-cleanup-m3d RichardTea 2019-12-03 14:16:11 +00:00
  • 45a96af9ac Fix typo in M3DWrapper.cpp RichardTea 2019-12-03 14:15:50 +00:00
  • e5b065da3e Formatter is a stringstream RichardTea 2019-12-03 13:35:53 +00:00
  • 3a977d009d Merge branch 'master' into remove-cout-2797 RichardTea 2019-12-03 13:24:03 +00:00
  • ee537b70ad Correct M3DWrapper ifdef guards RichardTea 2019-12-03 13:18:59 +00:00
  • e668eead19 Some cleanup of M3D support RichardTea 2019-12-03 12:56:21 +00:00
  • e5edd8a28a Merge branch 'master' into preserve_error_string Kim Kulling 2019-12-03 11:29:35 +01:00
  • a98a8edb71 Merge pull request #2770 from muxanickms/fix_memory_leak_in_gltf2_on_exception Kim Kulling 2019-12-03 11:28:22 +01:00
  • 903ce59ffe Merge branch 'master' into fix_memory_leak_in_gltf2_on_exception Kim Kulling 2019-12-02 19:07:44 +01:00
  • fc5e4b22e2 Merge pull request #2752 from thomasbiang/fix_vertex_weighted_repeatedly Kim Kulling 2019-12-02 18:44:46 +01:00
  • 496382982a Remove cout calls from FBX, LWO and B3D RichardTea 2019-12-02 11:56:55 +00:00
  • 631da3a3d1 Merge branch 'master' into preserve_error_string Mike Samsonov 2019-12-02 10:35:29 +00:00
  • 5297529bb1 MSVC: Disable optimisations in debug build RichardTea 2019-12-02 10:07:48 +00:00
  • 7c0f84f484 Merge branch 'master' into fix_gltf_accessor_overflow Cory Fabre 2019-12-01 19:31:44 -06:00
  • 2cb15ba5c8 Merge pull request #2765 from gerkey/assimp_5.0_release Kim Kulling 2019-12-01 22:49:46 +01:00
  • 4071fcd398 Update Exporter.cpp Kim Kulling 2019-12-01 22:46:48 +01:00
  • 54720e36cb Merge branch 'master' into fix_vertex_weighted_repeatedly Kim Kulling 2019-12-01 22:46:18 +01:00
  • 6117c3f589 Merge pull request #2792 from migenius/migenius-fix-dracocrash Kim Kulling 2019-12-01 16:33:49 +01:00
  • 7967deb06a Update glTF2Asset.inl Kim Kulling 2019-12-01 12:34:45 +01:00
  • bf3b5f4e58 Merge branch 'master' into migenius-fix-dracocrash Kim Kulling 2019-12-01 12:32:44 +01:00
  • ef4bf35f69 Merge branch 'master' into fix_gltf_accessor_overflow Gordon MacPherson 2019-11-30 17:11:07 +00:00
  • 11c69c2aaf Merge pull request #2789 from assimp/kimkulling-patch-1 Kim Kulling 2019-11-28 20:24:19 +01:00
  • 97b71dd03b Add reading of extensionsRequired and explicit check to throw an error if Draco compression is required. Fixes issue #2791. Paul Arden 2019-11-28 09:01:01 +10:00
  • 9f6a010e05 Merge pull request #12 from assimp/master ardenpm 2019-11-28 09:18:30 +11:00
  • c9155160f4 Merge branch 'master' into kimkulling-patch-1 Kim Kulling 2019-11-27 22:03:22 +01:00
  • 084a88498e Merge pull request #2787 from migenius/migenius-fix-khrtexturetransform Kim Kulling 2019-11-27 19:42:52 +01:00
  • 4754d2dc6d Update CMakeLists.txt Kim Kulling 2019-11-27 17:32:55 +01:00
  • 30851b796f Update glTF2Importer.cpp Kim Kulling 2019-11-27 17:18:12 +01:00
  • e4f1b8e609 Correctly change the coordinate system of the glTF UV transforms to match those used internally inside Assimp. This should now hopefully result in a complete implementation for issue #2119 Paul Arden 2019-11-27 11:05:31 +11:00
  • 81ffacfc34 Merge pull request #11 from assimp/master ardenpm 2019-11-27 07:32:40 +11:00
  • f52df5d242 Merge branch 'master' into fix_gltf_accessor_overflow Gordon MacPherson 2019-11-26 18:42:07 +00:00
  • 12b7fafb3f Merge pull request #2782 from migenius/migenius-fix-doubleexport Kim Kulling 2019-11-26 18:07:12 +01:00
  • fdd76a6d0b Merge branch 'migenius-fix-doubleexport' of github.com:migenius/assimp into migenius-fix-doubleexport Paul Arden 2019-11-26 18:17:55 +11:00
  • b4f778f53b Fix aiGetMaterialUVTransform which assumed the data was 4 floats when in fact it is 5 floats. Fixes and issue seen in #2119. Paul Arden 2019-11-26 18:17:35 +11:00
  • 184caea952 Merge branch 'master' into migenius-fix-doubleexport Kim Kulling 2019-11-25 21:24:35 +01:00
  • 6e7e459ed0 Merge pull request #2783 from bztsrc/master Kim Kulling 2019-11-25 21:12:34 +01:00
  • a413774e24 Merge pull request #16 from assimp/master Madrich 2019-11-25 14:09:26 +01:00
  • 7230f32c14 Fix issue with y UV translation. Fixes #2119. Paul Arden 2019-11-25 20:58:21 +11:00
  • 8f2123379d Merge branch 'master' into master Zoltan Baldaszti 2019-11-25 05:23:18 +01:00
  • 9ddeb4edad MinGW support, profiling and signed error code bzt 2019-11-25 05:03:10 +01:00
  • 929d83398d Remove duplicate call to exporter. Fixes issue #2718. Paul Arden 2019-11-25 13:51:33 +11:00
  • aff323981c Merge pull request #10 from assimp/master ardenpm 2019-11-25 13:29:27 +11:00
  • 16397c1849 Merge pull request #2780 from LoicFr/master Kim Kulling 2019-11-23 15:52:56 +01:00
  • 5cfb0fd633 Add function aiGetVersionPatch() to be able to display Assimp version as in Git tags Loïc 2019-11-22 18:27:34 +01:00
  • 136996e1f6 Use std::numeric_limits for double max Cory Fabre 2019-11-22 10:56:31 -06:00
  • 981c4b6302 Merge pull request #2727 from da-raf/master Kim Kulling 2019-11-22 17:04:52 +01:00
  • 868aea8d94 Merge branch 'master' into fix_vertex_weighted_repeatedly Kim Kulling 2019-11-22 08:19:50 +01:00
  • 36ca37f9ac Merge branch 'master' into fix_gltf_accessor_overflow Cory Fabre 2019-11-22 00:14:11 -06:00
  • 91e6d3abeb Fix glTF Accessor min and max values Cory Fabre 2019-11-21 23:46:14 -06:00
  • 3cc4ec4eec Merge branch 'master' into master Kim Kulling 2019-11-21 22:10:28 +01:00
  • 0934c6e277 Merge pull request #2766 from bztsrc/master Kim Kulling 2019-11-21 22:09:21 +01:00
  • da6f474188 Merge branch 'master' into master Kim Kulling 2019-11-21 17:44:07 +01:00
  • e67b92885d Merge pull request #2775 from assimp/kimkulling-patch-1 Kim Kulling 2019-11-21 10:36:07 +01:00
  • 718d325b7c Merge branch 'master' into warning-level-max Dylan Kenneally 2019-11-21 12:15:33 +11:00
  • 97dc0ce15d Added CMake option to set the compiler warning to max (-Wall /W4). Off by default Dylan Kenneally 2019-11-21 12:04:53 +11:00
  • 42fa22f85e Update Readme.md Kim Kulling 2019-11-20 21:26:36 +01:00
  • fea84aaba3 Merge pull request #2771 from assimp/kimkullig_dev Kim Kulling 2019-11-20 20:53:06 +01:00
  • 6b63aa6159 Merge branch 'master' into master Zoltan Baldaszti 2019-11-20 16:55:22 +01:00
  • f78446b14a closes https://github.com/assimp/assimp/issues/2733: update of zlip to fix gcc build for v9.2.0 32 bit Kim Kulling 2019-11-19 20:30:40 +01:00
  • 8ca476954a Merge pull request #2748 from thewoz/master Kim Kulling 2019-11-19 20:13:00 +01:00
  • 375ee17339 Merge branch 'fix_memory_leak_in_gltf2_on_exception' of https://github.com/muxanickms/assimp into fix_memory_leak_in_gltf2_on_exception Mike Samsonov 2019-11-19 17:44:05 +00:00
  • 91af4b7476 fix the crash Mike Samsonov 2019-11-19 17:43:31 +00:00
  • 5985bdfebf Merge branch 'master' into fix_memory_leak_in_gltf2_on_exception Kim Kulling 2019-11-19 18:11:10 +01:00
  • 12f184867e Fix for memory leak in glTF2 Importer if an exception has been thrown Mike Samsonov 2019-11-19 17:05:24 +00:00
  • 6f7cb6af06 revert memory leak fix Mike Samsonov 2019-11-19 16:58:48 +00:00
  • b93c360b87 memory leak fix Mike Samsonov 2019-11-19 16:10:34 +00:00
  • abdbecfca2 Merge branch 'master' into master Kim Kulling 2019-11-19 16:29:59 +01:00
  • 7c312f6f68 Merge branch 'master' into master Zoltan Baldaszti 2019-11-19 01:28:11 +01:00
  • f0358fbe84 Merge pull request #2764 from assimp/kimkullig_dev Kim Kulling 2019-11-19 00:39:01 +01:00
  • 7e222f0730 fix invalid cast. Kim Kulling 2019-11-18 18:43:28 +01:00
  • 83e9c551f5 stbi functions prefixed for those who do not know how to use inlcude bzt 2019-11-18 18:31:53 +01:00
  • 80f5283b2f Error string of Importer should contain a message in case of an exception Mike Samsonov 2019-11-18 16:57:01 +00:00
  • 301748be6a Make Clang happy bzt 2019-11-18 15:22:15 +01:00
  • 2b252bb9a5 My mistake, fixed bzt 2019-11-18 06:23:41 +01:00
  • 2bd92aeb88 Merge branch 'master' into master Zoltan Baldaszti 2019-11-18 03:21:34 +01:00
  • e9df0259bb Link to the new homepage bzt 2019-11-18 03:07:57 +01:00
  • 41ae01a6b2 Upgraded to newest SDK and improved texture import bzt 2019-11-18 03:04:52 +01:00
  • 84deb1db44 Fix shared lib name on macOS Brian Gerkey 2019-11-17 15:45:47 -08:00
  • 75204e20bd fix invalid setup for texture enum. Kim Kulling 2019-11-16 19:22:37 +01:00
  • 17257cd2ae just a try, i dunno have a clue ... Kim Kulling 2019-11-16 15:51:26 +01:00
  • 2eed8b1820 TextureTransform: set material transform only when the extension is provided. Kim Kulling 2019-11-16 08:08:57 +01:00
  • 4ad2368116 disable samples per default. Kim Kulling 2019-11-15 21:46:09 +01:00
  • 3a8cb442f3 closes https://github.com/assimp/assimp/issues/2681: add dx11-sample to cmake. Kim Kulling 2019-11-15 20:52:13 +01:00