Commit Graph

  • 9493ec670d Merge branch 'kimkullig_dev' of https://github.com/assimp/assimp into kimkullig_dev Kim Kulling 2019-11-15 19:39:14 +01:00
  • a8182d86cb fix initialization + some vs2019 compiler warnings. Kim Kulling 2019-11-15 19:38:37 +01:00
  • 13a4619817 Merge branch 'master' into kimkullig_dev Kim Kulling 2019-11-15 18:52:04 +01:00
  • 17946e26ef add missing setup of texture transform in aiMaterial. Kim Kulling 2019-11-15 18:35:33 +01:00
  • 74080a083a add texture-transfrm unittest. Kim Kulling 2019-11-14 21:15:30 +01:00
  • 04db5cd5ea closes https://github.com/assimp/assimp/issues/2119: initial version. Kim Kulling 2019-11-14 21:11:53 +01:00
  • a9f82dbe0b Merge pull request #2758 from jcarpent/topic/c++11 Kim Kulling 2019-11-12 18:49:33 +01:00
  • 0c3c88270a Merge branch 'master' into master Kim Kulling 2019-11-11 10:19:22 +01:00
  • 28a9fb31fd Merge branch 'master' into topic/c++11 Justin Carpentier 2019-11-10 13:20:05 +01:00
  • d5ac333005 Merge pull request #2759 from assimp/kimkullig_dev Kim Kulling 2019-11-10 12:08:05 +01:00
  • 73274316be Merge remote-tracking branch 'upstream/master' thewoz 2019-11-10 11:50:38 +01:00
  • aa25c815bd closes https://github.com/assimp/assimp/issues/1320: make sure build works with all exporter disabled. Kim Kulling 2019-11-10 09:47:50 +01:00
  • 031d3b648e defs: use noexcept only for C++11 and more Justin Carpentier 2019-11-10 08:23:17 +01:00
  • 595f937ff9 Merge pull request #2757 from assimp/kimkullig_dev Kim Kulling 2019-11-09 17:55:11 +01:00
  • 58729b1b3d fix debug-target. Kim Kulling 2019-11-09 11:28:56 +01:00
  • b63285f9ad closes https://github.com/assimp/assimp/issues/2684: normalize path Kim Kulling 2019-11-09 11:12:47 +01:00
  • ddf7c0ad8f avoid weighting vertex repeatedly when joining identical vertices Yingying Wang 2019-11-05 17:34:32 -08:00
  • 78ec42fc17 Merge pull request #2751 from muxanickms/export_fbx_bigger_than_2GB_fix Kim Kulling 2019-11-05 21:54:55 +01:00
  • adec426b7c Fix for exporting fbx bigger than 2GB Mike Samsonov 2019-11-05 17:11:56 +00:00
  • c890a4d521 Update .gitignore thewoz 2019-11-05 16:36:03 +01:00
  • 308db73d0b Merge pull request #2736 from bztsrc/master Kim Kulling 2019-11-04 22:18:08 +01:00
  • d29185ec7d Merge branch 'master' into master Kim Kulling 2019-11-03 21:22:01 +01:00
  • 1aaec5ea7b Merge pull request #2728 from RevoluPowered/feature/clang-formatting Kim Kulling 2019-11-03 21:03:58 +01:00
  • 2e84f5174d Merge branch 'master' into feature/clang-formatting Kim Kulling 2019-11-03 10:33:17 +01:00
  • ef06cabe6c Merge pull request #2741 from muxanickms/fbx_orphant_embedded_textures Kim Kulling 2019-11-03 10:32:17 +01:00
  • c49e67ee1e Merge branch 'master' into master Zoltan Baldaszti 2019-11-02 15:53:33 +01:00
  • df30c83db4 Merge branch 'master' into fbx_orphant_embedded_textures Kim Kulling 2019-11-02 15:10:32 +01:00
  • d518950e80 Merge pull request #2744 from tanolino/patch-1 Kim Kulling 2019-11-02 15:09:57 +01:00
  • dda46f5f4d Merge branch 'master' into master Zoltan Baldaszti 2019-11-02 01:14:04 +01:00
  • 7201ebdccc Make Clang happy bzt 2019-11-01 21:52:11 +01:00
  • 7d9e9aadbb Asked modifications and unit test bzt 2019-11-01 17:21:24 +01:00
  • 82f926971b Update CXMLReaderImpl.h tanolino 2019-11-01 17:01:52 +01:00
  • 536fea1c8d operator less for old compilers Mike Samsonov 2019-11-01 14:50:30 +00:00
  • 55c2a3edb9 FBX orphant embedded textures Mike Samsonov 2019-11-01 12:29:54 +00:00
  • 8ebd48442e Made the M3D SDK C++ wrapper optional bzt 2019-11-01 03:39:36 +01:00
  • 805bc2e766 Update ColladaParser.cpp Kim Kulling 2019-10-31 20:18:39 +01:00
  • aa4c9fb5fa Merge pull request #2731 from RevoluPowered/feature/easy-armature-lookup Kim Kulling 2019-10-30 20:23:59 +01:00
  • 3bf81375da Fixed clang's problem with register keyword bzt 2019-10-30 03:06:24 +01:00
  • 37cc29c020 Fixed clang's problem with register keyword bzt 2019-10-30 03:04:33 +01:00
  • 0ff3e40157 Fixed clang's casting issue and MSVC's buffer allocation problem bzt 2019-10-30 02:35:51 +01:00
  • 60e9157699 Fixed AI_MATKEY list string constant issue. My gcc didn't comply about this bzt 2019-10-30 01:37:28 +01:00
  • 5a79287041 More reduced scope fix, what's wrong with reusing i as a loop variable? bzt 2019-10-30 01:21:15 +01:00
  • 7ed621b53f More reduced scope fix by wasting more memory... bzt 2019-10-30 01:14:20 +01:00
  • 1c23d2e8de More reduced scope fix by wasting more memory... bzt 2019-10-30 01:11:34 +01:00
  • 5b18baf883 Fixed issues with MSVC bzt 2019-10-30 00:55:54 +01:00
  • 02a63f8b10 Fixed template being used in file RevoluPowered 2019-10-29 20:21:16 +00:00
  • be09110aa8 Merge branch 'master' into feature/easy-armature-lookup Kim Kulling 2019-10-29 21:09:50 +01:00
  • 6432fc8168 Merge pull request #2726 from quanterion/fix-3ds-material-names Kim Kulling 2019-10-29 21:06:15 +01:00
  • a622e109a0 Fixed PR Quality Review Issues bzt 2019-10-29 18:42:10 +01:00
  • 0baec5f0bd Added M3D format support bzt 2019-10-29 14:14:00 +01:00
  • 459d8105a7 Merge branch 'master' into fix-3ds-material-names Kim Kulling 2019-10-29 13:18:23 +01:00
  • 15dcd5c096 Merge pull request #2725 from migenius/migenius-fix-pbrsg Kim Kulling 2019-10-29 12:57:23 +01:00
  • 18555abed0 Merge branch 'master' into migenius-fix-pbrsg Kim Kulling 2019-10-28 20:08:47 +01:00
  • 2ed0d905ab Merge pull request #2717 from migenius/migenius-fix-doublefree Kim Kulling 2019-10-28 20:00:05 +01:00
  • 571d64e3c1 Merge branch 'master' into migenius-fix-doublefree Kim Kulling 2019-10-28 07:51:19 +01:00
  • 562ad9dc99 Merge pull request #2711 from RichardTea/collada_zae_textures_2710 Kim Kulling 2019-10-28 07:50:41 +01:00
  • 61ea5a4ac6 Merge branch 'master' into collada_zae_textures_2710 Kim Kulling 2019-10-27 18:24:16 +01:00
  • 3255f1ad17 Merge pull request #2709 from RichardTea/assimp_version_2693 Kim Kulling 2019-10-27 18:23:27 +01:00
  • d7d79db0ac Tests should always debug log RevoluPowered 2019-10-27 12:57:47 +00:00
  • 5155efe888 Fixed bitmask issue RevoluPowered 2019-10-27 13:53:43 +00:00
  • a9a0d4d29b Tidying order of function calls and fixed debug statements RevoluPowered 2019-10-27 13:53:11 +00:00
  • 212bcfe75c Test disable cache RevoluPowered 2019-10-27 12:27:54 +00:00
  • 9c8d835704 Explicitly use nullptr RevoluPowered 2019-10-27 11:29:56 +00:00
  • 5d0c63391b Explicitly set the size of the parent node if we have no children RevoluPowered 2019-10-27 11:21:49 +00:00
  • a30936954e Best to check the number of children before checking the actual array RevoluPowered 2019-10-27 11:21:23 +00:00
  • 514257f587 Added unit tests for ArmaturePopulate when used (added huestos model to tests) RevoluPowered 2019-10-26 19:48:34 +01:00
  • 46cdd81d75 Added ArmaturePopulate scale process for all formats RevoluPowered 2019-10-26 18:47:48 +01:00
  • 93efe4197a Removed redundant rest matrix and fixed assert compile error RevoluPowered 2019-10-26 18:09:26 +01:00
  • 6ea97a1282 Updated test cases to test import of names RevoluPowered 2019-10-26 17:27:07 +01:00
  • 168ae22ad4 Implemented easy armature lookup RevoluPowered 2019-10-26 16:28:51 +01:00
  • 120e97e55b Merge branch 'master' into assimp_version_2693 Kim Kulling 2019-10-27 13:47:59 +01:00
  • 29f7ea0235 Merge pull request #2698 from Zalewa/mingw-fix-2685 Kim Kulling 2019-10-27 13:47:24 +01:00
  • b8321925c3 Merge branch 'master' into mingw-fix-2685 Kim Kulling 2019-10-27 10:43:00 +01:00
  • e63123de75 Merge pull request #2697 from ffontaine/master Kim Kulling 2019-10-27 10:42:33 +01:00
  • 93d87c775d Merge branch 'master' into master Kim Kulling 2019-10-27 09:00:47 +01:00
  • 3bfd06483e Merge pull request #2723 from assimp/kimkulling-patch-1 Kim Kulling 2019-10-25 17:15:09 +02:00
  • b5f659c98d Added clang format RevoluPowered 2019-10-02 19:44:58 +01:00
  • 5baff40edc Git ignore RevoluPowered 2019-10-02 19:44:30 +01:00
  • 2d086fd236 ColladaParser: fix handling of empty XML-elements Raphael Dümig 2019-10-25 15:10:54 +02:00
  • 5f58ef82b9 prevent accidental lower casing material names in ReplaceDefaultMaterial Rem 2019-10-25 10:18:27 +03:00
  • cbd4e8bc22 Fix inconsistent indentation in previous commit. Paul Arden 2019-10-25 12:19:28 +11:00
  • 822be33408 Move pbrSG glossinessFactor into the correct material extension object. Fixes issue #2724. Paul Arden 2019-10-25 12:17:43 +11:00
  • fa8ab3b1e7 Merge pull request #9 from assimp/master ardenpm 2019-10-25 11:55:13 +11:00
  • 7abc551b47 Merge branch 'master' into kimkulling-patch-1 Kim Kulling 2019-10-24 20:22:32 +02:00
  • 41ab019cbf Update appveyor.yml Kim Kulling 2019-10-23 22:42:19 +02:00
  • bd25cc7c8f Merge pull request #2704 from MalcolmTyrrell/fix-gltf-importer-crash Kim Kulling 2019-10-23 22:39:12 +02:00
  • 932acf4350 Merge branch 'master' into fix-gltf-importer-crash Kim Kulling 2019-10-23 20:14:38 +02:00
  • 31e885a47a Update appveyor.yml Kim Kulling 2019-10-22 20:24:23 +02:00
  • 85bde1122d Merge pull request #2715 from migenius/migenius-fix-vs2013-build Kim Kulling 2019-10-22 20:23:22 +02:00
  • df3e22d9ba Merge branch 'master' into migenius-fix-vs2013-build Kim Kulling 2019-10-21 20:57:29 +02:00
  • 9bc2648615 Merge branch 'master' into fix-gltf-importer-crash Malcolm Tyrrell 2019-10-21 15:29:18 +01:00
  • 3a484d879f Merge pull request #2722 from jherico/patch-1 Kim Kulling 2019-10-20 15:15:08 +02:00
  • effdb74a87 Merge branch 'master' into patch-1 Kim Kulling 2019-10-19 20:54:17 +02:00
  • 1dd532d61b Merge pull request #2690 from TGEnigma/fix_dae_export Kim Kulling 2019-10-19 20:52:57 +02:00
  • c350d4f487 Update ColladaExporter.cpp Kim Kulling 2019-10-19 12:08:57 +02:00
  • fa1dc3b8f1 Fix CMake import Bradley Austin Davis 2019-10-18 13:02:32 -07:00
  • d8979cbc1f Merge pull request #2 from assimp/master Tomas Mariancik 2019-10-18 14:30:34 +02:00
  • 9aa9238e7e Copy texture data before handing on to asset which then handles freeing of the memory. This prevents the memory being released twice which was throwing an error. Fixes issue #2714. Paul Arden 2019-10-18 14:40:41 +11:00
  • 075d05e604 Merge branch 'master' into fix_dae_export TGE 2019-10-17 23:52:44 +02:00
  • 51fc0f4ec4 Merge branch 'master' into assimp_version_2693 RichardTea 2019-10-16 10:00:50 +01:00