Commit Graph

  • 98767cbb08 pull master Yingying Wang 2020-05-27 10:23:28 -0700
  • f4dd5eafd0
    Merge branch 'master' into master Kim Kulling 2020-05-26 21:48:39 +0200
  • 1427e67b54
    Merge pull request #3219 from thomasbiang/gltf2_sparseAccessor_import Kim Kulling 2020-05-26 21:44:56 +0200
  • 2c9cfefe67
    Merge branch 'master' into gltf2_sparseAccessor_import Kim Kulling 2020-05-26 21:30:51 +0200
  • 03eb08d98e
    Merge pull request #3243 from assimp/issue_3183-1 Kim Kulling 2020-05-25 21:02:00 +0200
  • ee45a18852
    Merge branch 'master' into issue_3183-1 Kim Kulling 2020-05-25 20:50:19 +0200
  • a7e03ddb1c
    Merge pull request #3242 from assimp/issue_3183 Kim Kulling 2020-05-25 20:50:03 +0200
  • 545c63d6bd
    Fix function prototype of aiGetMemoryRequirements Kim Kulling 2020-05-25 20:49:21 +0200
  • 9150dc176c
    Update Assimp.cpp Kim Kulling 2020-05-25 20:44:31 +0200
  • c94ed5c7b1
    Update utRemoveComponent.cpp Kim Kulling 2020-05-25 20:40:19 +0200
  • 4a2cb779bb
    Merge branch 'master' into issue_3183 Kim Kulling 2020-05-25 20:38:55 +0200
  • 8d98d8a72d
    Merge pull request #3241 from assimp/kimkulling-dev Kim Kulling 2020-05-25 20:38:41 +0200
  • c82f8c0b8f
    Remove duplicated code Kim Kulling 2020-05-25 20:38:12 +0200
  • e33ed9e7a1
    File is duplicated Kim Kulling 2020-05-25 20:30:18 +0200
  • 78c9ac2889
    Merge branch 'master' into gltf2_sparseAccessor_import Kim Kulling 2020-05-25 16:11:01 +0200
  • 2be731d1bf Merge branch 'master' into pugi_xml Kim Kulling 2020-05-22 10:09:46 +0200
  • a6d554f645
    Merge pull request #3233 from kshepherd2013/master Kim Kulling 2020-05-21 22:21:58 +0200
  • a97e4c15b3
    Merge branch 'master' into master Kim Kulling 2020-05-21 21:15:50 +0200
  • 1681850424
    Merge pull request #3232 from MalcolmTyrrell/verboseLogging Kim Kulling 2020-05-21 21:12:11 +0200
  • ecfca1d5c5
    Merge branch 'master' into verboseLogging Kim Kulling 2020-05-21 18:30:52 +0200
  • f940a37be6
    Merge pull request #3235 from rmstyrczula/master Kim Kulling 2020-05-20 10:20:00 +0200
  • 50f0a86798 conditional export Yingying Wang 2020-05-19 16:10:41 -0700
  • c4055d04b4 Fix double free caused in FindInvalidDataProcess Ryan Styrczula 2020-05-19 14:38:10 -0400
  • c10e409a5d merge Yingying Wang 2020-05-18 12:16:45 -0700
  • 193deb3441 cleanup Yingying Wang 2020-05-18 12:01:09 -0700
  • e39c632809 cleanup Yingying Wang 2020-05-18 11:50:51 -0700
  • a87df0eb32 merge Yingying Wang 2020-05-18 11:35:46 -0700
  • 0897c4c7be merge Yingying Wang 2020-05-18 11:31:44 -0700
  • 02cbd36271 pull master Yingying Wang 2020-05-18 11:15:18 -0700
  • e9a3cc2c8a
    Fixed rotation order bug in BVH Loader Kevin Shepherd 2020-05-18 16:07:46 +0100
  • 14692368d5 Same for LogDebug -> LogVerboseDebug Malcolm Tyrrell 2020-05-18 11:55:14 +0100
  • df2630d0e8 Change in comment. Malcolm Tyrrell 2020-05-18 11:45:13 +0100
  • 87a7662bee More thinks using VERBOSE_DEBUG Malcolm Tyrrell 2020-05-18 11:45:00 +0100
  • 3b15eca099
    Merge pull request #3226 from M4T1A5/gltf2_fix_skin_recursion Kim Kulling 2020-05-18 11:12:49 +0200
  • 80c88ffc73 optimize CMakeLists.txt xiaozhuai 2020-05-18 15:40:12 +0800
  • 2438e1b52e
    Merge branch 'master' into gltf2_fix_skin_recursion Kim Kulling 2020-05-18 09:05:28 +0200
  • af3033ee8b
    Merge branch 'master' into gltf2_sparseAccessor_import Kim Kulling 2020-05-17 17:21:55 +0200
  • 110f8845a2
    Merge pull request #3215 from kalyan-kumar/unix-cmake-fix Kim Kulling 2020-05-17 16:21:42 +0200
  • 1259146daa
    Merge branch 'master' into unix-cmake-fix Kim Kulling 2020-05-17 14:14:12 +0200
  • 0fc82388f9
    Merge pull request #3214 from jercytryn/master Kim Kulling 2020-05-17 14:12:48 +0200
  • 4b0a3305b1
    Merge branch 'master' into master Kim Kulling 2020-05-17 13:54:10 +0200
  • 9566284873
    Merge pull request #3229 from assimp/qarmin-added_check_before_using Kim Kulling 2020-05-17 13:53:44 +0200
  • 4f24b3dac2 Merge branch 'added_check_before_using' of https://github.com/qarmin/assimp into qarmin-added_check_before_using Kim Kulling 2020-05-17 11:48:24 +0200
  • 15125c5eb8
    Merge pull request #3205 from RichardTea/bug-3201-collada_root_meshes Kim Kulling 2020-05-17 11:39:02 +0200
  • cfbdacb02a
    Merge branch 'master' into bug-3201-collada_root_meshes Kim Kulling 2020-05-16 20:50:34 +0200
  • 883f18ebe5
    Merge pull request #3195 from dmgolembiowski/master Kim Kulling 2020-05-16 20:49:55 +0200
  • d7e8fefed7
    Merge branch 'master' into master Kim Kulling 2020-05-16 20:41:05 +0200
  • 7fe5257e0f
    Merge pull request #3194 from RichardTea/collada_unit_test_cleanup Kim Kulling 2020-05-16 20:40:28 +0200
  • df9c09d9e1
    Merge branch 'master' into collada_unit_test_cleanup Kim Kulling 2020-05-16 19:59:30 +0200
  • b20e637709
    Merge branch 'master' into importer_exporter_memory_leak_fix Kim Kulling 2020-05-16 18:41:21 +0200
  • b8e39b58d1 clean up Yingying Wang 2020-05-15 12:32:58 -0700
  • f6720271cb sparce accessor exporter Yingying Wang 2020-05-15 12:20:31 -0700
  • d70685d37f Fix typo Malcolm Tyrrell 2020-05-15 17:50:48 +0100
  • 90cdbd9d9a Fix ups Malcolm Tyrrell 2020-05-15 17:46:50 +0100
  • 434c5e3d37 More verbose logging Malcolm Tyrrell 2020-05-15 16:59:42 +0100
  • e11d78596f Use verbose debug logging in certain places Malcolm Tyrrell 2020-05-15 12:59:48 +0100
  • 5e0136d737 Add concept of verboseDebug Malcolm Tyrrell 2020-05-15 12:47:27 +0100
  • 2ffd1cb8db nits Malcolm Tyrrell 2020-05-15 09:29:20 +0100
  • bcca3a0d79 No need for bespoke macros Malcolm Tyrrell 2020-05-14 17:46:33 +0100
  • 6be0ce1ec9 Initial pass at adding logging Malcolm Tyrrell 2020-05-14 17:43:31 +0100
  • 7a16a7a7e4 Fix infinite recursion in gltf2 skin parsing Matias Kangasjärvelä 2020-05-15 16:48:41 +0300
  • b7de061749
    Merge pull request #3225 from assimp/inhosens-master Kim Kulling 2020-05-15 15:16:47 +0200
  • 464d4cf99a Merge branch 'master' of https://github.com/inhosens/assimp into inhosens-master kimkulling 2020-05-15 15:08:30 +0200
  • e74d86b40e
    Merge pull request #3224 from assimp/migenius-migenius-fix-ortho Kim Kulling 2020-05-15 14:09:42 +0200
  • 246ec2b0dc Merge branch 'migenius-fix-ortho' of https://github.com/migenius/assimp into migenius-migenius-fix-ortho kimkulling 2020-05-15 13:37:03 +0200
  • 22607de237
    Merge pull request #3223 from assimp/zyndor-master Kim Kulling 2020-05-15 10:51:41 +0200
  • a6b5abd698 Merge branch 'master' of https://github.com/zyndor/assimp into zyndor-master kimkulling 2020-05-15 08:51:46 +0200
  • c32f587a89
    Merge pull request #3188 from RichardTea/bug-3177-dae-geo-id Kim Kulling 2020-05-13 20:39:14 +0200
  • 2571b47a28
    Merge branch 'master' into bug-3177-dae-geo-id Kim Kulling 2020-05-13 20:24:53 +0200
  • e9b67cdb89 gltf2 import sparse accessor Yingying Wang 2020-05-11 14:34:35 -0700
  • c3a21666da Make gltf2 export normal normalization safe Jeremy Cytryn 2020-05-07 01:21:54 -0700
  • c5a9fbd47f Gracefully handle NaNs and Infs in gltf2 accessor bound computation Jeremy Cytryn 2020-05-06 23:59:48 -0700
  • aef4ecada5 Fail gltf/gltf2 export whenever invalid / incomplete JSON is generated Jeremy Cytryn 2020-05-06 23:41:05 -0700
  • 578dc09810
    Merge pull request #3175 from hoshiryu/fix_fbx_rotation Kim Kulling 2020-05-11 19:19:40 +0200
  • 3fdcd0861f Fix fbx rotation ; hoshiryu 2020-04-27 18:35:53 +0200
  • 60256b8c1c
    Merge pull request #3146 from pseiderer/ps-devel-fix-contrib-zlib-static-compile-001 Kim Kulling 2020-05-09 12:20:56 +0200
  • ea26cba420
    Merge branch 'master' into ps-devel-fix-contrib-zlib-static-compile-001 Kim Kulling 2020-05-09 11:10:33 +0200
  • b990f703a0 Add IMPORTED_CONFIGURATIONS property to cmake target. Kalyan Kumar 2020-05-07 15:00:21 -0700
  • 4c654d3211
    Merge pull request #3211 from assimp/add_fuzzer_target Kim Kulling 2020-05-07 15:23:38 +0200
  • 40e99113cb
    Fix findings Kim Kulling 2020-05-07 15:03:35 +0200
  • 906720ee93
    Merge branch 'master' into add_fuzzer_target Kim Kulling 2020-05-07 14:59:55 +0200
  • 0af541e7cd
    Merge pull request #3212 from assimp/remove_step_prototype Kim Kulling 2020-05-07 14:59:36 +0200
  • a1bcca2c99 remove step prototype: does not work this way. kimkulling 2020-05-07 14:00:40 +0200
  • 927488ee5d integrate first fuzzer target. kimkulling 2020-05-07 13:59:18 +0200
  • 9f03397f32
    Merge pull request #3105 from rudybear/master Kim Kulling 2020-05-07 00:25:13 +0200
  • 89a865ce19
    Merge branch 'master' into master Kim Kulling 2020-05-06 22:07:39 +0200
  • 8d41af09bc
    Merge pull request #3209 from sercand/fix-macos-framework Kim Kulling 2020-05-06 15:50:52 +0200
  • 201347700f fix incorrect header path on framework build Sercan Degirmenci 2020-05-06 16:15:23 +0300
  • e0f0084fde
    Merge branch 'master' into remove-UpdateAssimpLibsDebugSymbolsAndDLLs Kim Kulling 2020-05-06 14:39:59 +0200
  • d8bb6e446a
    Merge pull request #3208 from assimp/issue_3186 Kim Kulling 2020-05-06 13:56:10 +0200
  • 4c75857f50
    Remove duplicate flag Kim Kulling 2020-05-06 13:46:26 +0200
  • 519b5871e3
    Merge pull request #3207 from thomasbiang/gltf2_blendshapeImportMissing Kim Kulling 2020-05-06 13:34:30 +0200
  • 60e8146b9f fix wrong target idx when importing Yingying Wang 2020-05-05 12:51:40 -0700
  • cacc7c1b27
    Merge pull request #3204 from assimp/aaronfranke-file-formatting Kim Kulling 2020-05-05 17:09:55 +0200
  • dc8550290e Ensure to delete the scene copy after the test RichardTea 2020-05-05 10:53:26 +0100
  • 56a4e61533 Collada: Don't copy the scene when exporting RichardTea 2020-05-05 10:16:13 +0100
  • 6e447b2c44 Merge branch 'bug-3177-dae-geo-id' into bug-3201-collada_root_meshes RichardTea 2020-05-05 09:52:08 +0100
  • d1ae6ac77a Fix typo in <visual_scene> RichardTea 2020-05-05 09:51:41 +0100
  • 700bddb81a
    Merge branch 'master' into collada_unit_test_cleanup RichardTea 2020-05-05 09:34:09 +0100
  • fa1d2f09db
    Merge branch 'master' into bug-3177-dae-geo-id RichardTea 2020-05-05 09:33:48 +0100