Commit Graph

  • 5ec7e57b99 Merge branch 'assimp:master' into master Promit Roy 2022-03-17 15:00:09 -04:00
  • 68d33a6e13 Added support for more bone weights in GLTF2 Promit Roy 2022-03-17 14:55:26 -04:00
  • 19f2a624a9 Merge pull request #4451 from Promit/promit/gltf-attrib-bug-fix v5.2.3 Kim Kulling 2022-03-17 11:35:44 +01:00
  • 765b38cf04 Update glTF2Asset.inl Promit Roy 2022-03-16 16:49:45 -04:00
  • a916a0eda5 Merge pull request #4448 from assimp/kimkulling/MDL-fix_stackoverflow-issue4447 Kim Kulling 2022-03-16 14:14:46 +01:00
  • c2b05acaa6 Fix stack-overflow in MDLLoader Kim Kulling 2022-03-16 13:59:21 +01:00
  • a828114a1d Merge pull request #4446 from assimp/kimkulling/mdlimporter_fix_nullptr_dereferencing Kim Kulling 2022-03-16 10:23:29 +01:00
  • 552f3a308d Fix nullptr dereferencing Kim Kulling 2022-03-16 10:08:20 +01:00
  • 784d9615f5 Merge pull request #4444 from EYHN/windows-crt Kim Kulling 2022-03-15 21:55:21 +01:00
  • 6484dd6825 Merge branch 'master' into windows-crt Kim Kulling 2022-03-15 21:29:21 +01:00
  • d594e6eea4 Merge branch 'master' into obj-pbr-explicit Kim Kulling 2022-03-15 14:30:24 +01:00
  • bcee205542 Merge pull request #4437 from jaefunk/issue_4349 Kim Kulling 2022-03-15 14:28:43 +01:00
  • 0904490150 Merge branch 'master' into issue_4349 Kim Kulling 2022-03-15 14:11:57 +01:00
  • 7919461951 Merge pull request #4441 from assimp/kimkulling/fix_doxygen_version Kim Kulling 2022-03-15 14:11:38 +01:00
  • e4fb0e0960 Merge branch 'master' into kimkulling/fix_doxygen_version Kim Kulling 2022-03-15 13:33:54 +01:00
  • d87111983a Merge pull request #4431 from TerenceRussell/master Kim Kulling 2022-03-15 13:33:13 +01:00
  • b1dc8cfe56 Merge branch 'master' into master Kim Kulling 2022-03-15 11:58:45 +01:00
  • 7296ffc3f5 Merge pull request #4426 from sacereda/info-material-properties Kim Kulling 2022-03-15 11:57:58 +01:00
  • b567497a17 Merge branch 'master' into info-material-properties Kim Kulling 2022-03-15 10:57:14 +01:00
  • e1dae1402e Merge pull request #4425 from sacereda/metallic-roughness-split Kim Kulling 2022-03-15 10:56:43 +01:00
  • 68f3386c7b Merge branch 'master' into metallic-roughness-split Kim Kulling 2022-03-15 08:38:38 +01:00
  • 9e0357a8b6 Merge pull request #4423 from youkeyao/parse_obj_anisotropy Kim Kulling 2022-03-15 08:38:13 +01:00
  • 72888c49f6 Merge branch 'master' into parse_obj_anisotropy Kim Kulling 2022-03-15 08:13:35 +01:00
  • cd7df53a72 Add USE_STATIC_CRT option eyhn 2022-03-15 14:46:30 +08:00
  • 4457d9300a Merge branch 'master' into issue_4349 jaefunk 2022-03-14 15:41:20 +09:00
  • 0ef830d2b1 Update version in doxy-config Kim Kulling 2022-03-12 16:57:27 +01:00
  • 729ab8ae33 Trying to fix reorder error Sergio Acereda 2022-03-12 08:15:11 +01:00
  • 26bb601d8f Fix includes Sergio Acereda 2022-03-12 08:03:27 +01:00
  • 51e248909f Avoid setting metallic/roughness/sheen/clearcoat properties when they are not found on mtl file. Sergio Acereda 2022-03-11 22:29:59 +01:00
  • e02d51ec24 add ifndef guard for resolve to fails to compile jaefunk 2022-03-11 10:51:13 +09:00
  • a305d14b8f Merge pull request #4421 from RichardTea/update_ai_texture_type_max Kim Kulling 2022-03-10 13:54:55 +01:00
  • 5e69517742 Merge branch 'master' into update_ai_texture_type_max Kim Kulling 2022-03-10 11:37:46 +01:00
  • 1b3ae63527 Merge pull request #4434 from karjonas/always_true Kim Kulling 2022-03-10 11:37:03 +01:00
  • 47f004517f Add missing cast. Kim Kulling 2022-03-10 10:33:29 +01:00
  • c14eccefaf Fix 'i >= 0' always true bug Jonas Karlsson 2022-03-09 22:19:10 +01:00
  • efe92e9ec1 Merge branch 'assimp:master' into master Terence Russell 2022-03-09 10:15:41 -07:00
  • 1bf5dd2731 Merge pull request #4432 from assimp/kimkulling/init_fbx_texture_members_issue4429 Kim Kulling 2022-03-09 11:35:01 +01:00
  • 26598dc6bd Forget to save file. kimkulling 2022-03-09 11:00:05 +01:00
  • 76e10b96fc Fix missing members and do some small refactorings. kimkulling 2022-03-09 10:51:37 +01:00
  • b35879989c Added missing ObjMaterial.h to CMakeLists Terence Russell 2022-03-08 20:00:22 -07:00
  • 7aa87a9765 Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015 Kim Kulling 2022-03-08 19:10:53 +01:00
  • 40d896ccc1 Merge pull request #4403 from JaroslavPribyl/fix/obj_with_bspline_crash Kim Kulling 2022-03-07 21:39:38 +01:00
  • ba379c20e1 Merge branch 'master' into fix/obj_with_bspline_crash Kim Kulling 2022-03-06 17:39:57 +01:00
  • 92b5c284ce Merge pull request #4203 from RichardTea/deprecated_gltfpbr_macros Kim Kulling 2022-03-06 17:39:35 +01:00
  • 9ca9254445 Merge branch 'master' into deprecated_gltfpbr_macros Kim Kulling 2022-03-06 11:15:49 +01:00
  • 7eb5fd0e4e Merge pull request #4427 from assimp/smartday-master Kim Kulling 2022-03-05 23:00:21 +01:00
  • 80a8807c47 Fix compiler warnings Kim Kulling 2022-03-05 20:37:34 +01:00
  • d4527d4e87 Merge branch 'master' into master Kim Kulling 2022-03-05 14:00:32 +01:00
  • a2543e7151 Add properties information on assimp info command line Sergio Acereda 2022-03-04 17:09:29 +01:00
  • a1e03e3481 clang-format Sergio Acereda 2022-03-04 14:31:06 +01:00
  • cfe84b9260 Use generic METALNESS and DIFFUSE_ROUGHNESS texture types Sergio Acereda 2022-03-03 16:18:25 +01:00
  • 52008ec989 Apply clang-format Sergio Acereda 2022-03-03 15:42:23 +01:00
  • 9b227fc262 Fix getting anisotropy in obj youkeyao 2022-03-03 01:01:34 +08:00
  • 8a6a1fc2df Update AI_TEXTURE_TYPE_MAX RichardTea 2022-03-01 12:12:07 +00:00
  • d704824be3 Merge branch 'master' into deprecated_gltfpbr_macros RichardTea 2022-03-01 10:01:43 +00:00
  • bbcefbd034 Merge pull request #4417 from rbsheth/rbsheth_fix_hunter Kim Kulling 2022-02-28 23:48:19 +01:00
  • 62930076af Merge branch 'master' into fix/obj_with_bspline_crash Jaroslav Pribyl 2022-02-26 04:03:59 +01:00
  • e368a69824 Merge branch 'master' into rbsheth_fix_hunter Rahul Sheth 2022-02-25 14:58:07 -06:00
  • 3957fbba8b Merge pull request #4416 from SolaToucher/master Kim Kulling 2022-02-25 21:03:47 +01:00
  • 8e59287b94 Update version of Hunter to v0.24.0 that supports VS 2022 Rahul Sheth 2022-02-25 13:52:18 -06:00
  • c73ff82fc4 FBXConvert::ConvertMeshMultiMaterial: allocate memory using variable count_vertices sola 2022-02-25 19:58:44 +08:00
  • 04858c5d89 Merge pull request #4409 from TerenceRussell/master Kim Kulling 2022-02-25 00:06:12 +01:00
  • 94178df61b Merge branch 'master' into master Kim Kulling 2022-02-24 19:31:31 +01:00
  • 1b2f705ee4 Merge pull request #4415 from assimp/kimkulling/fix_negative_offset_in_hast_access-issue4414 Kim Kulling 2022-02-24 17:20:03 +01:00
  • 0dc24ab3a7 Fix declaration of offset Kim Kulling 2022-02-24 17:04:39 +01:00
  • cf96639119 Fix possible negative array access Kim Kulling 2022-02-24 16:49:35 +01:00
  • 72da1e6d7b Merge branch 'master' into master Kim Kulling 2022-02-23 21:20:39 +01:00
  • e3001f1eb7 Merge pull request #4408 from assimp/kimkulling/fix_ordering_of_gltf2_issue4407 Kim Kulling 2022-02-23 21:19:33 +01:00
  • 6f31254ae1 Ensure dictionary for LazyDics is created before adding content to it Kim Kulling 2022-02-23 20:57:15 +01:00
  • 3a09d19374 Merge branch 'master' into master Terence Russell 2022-02-22 18:43:11 -07:00
  • 4ddacdb5df Expose the original OBJ illum model as a material property. Terence Russell 2022-02-22 17:55:41 -07:00
  • 466b34cf53 Merge branch 'master' into kimkulling/fix_ordering_of_gltf2_issue4407 Kim Kulling 2022-02-22 21:09:11 +01:00
  • aa04ee89f1 Fix init order to fix build Kim Kulling 2022-02-22 21:07:42 +01:00
  • a6808b868c Small code cleanup Kim Kulling 2022-02-22 21:07:23 +01:00
  • 480d6fee2a cleanup Jaroslav Přibyl 2022-02-22 01:46:47 +01:00
  • 62c9347985 fixed obj parsing with cstype Jaroslav Přibyl 2022-02-22 01:32:41 +01:00
  • ba785910d1 Merge pull request #4402 from assimp/kimkulling/warn_when_viewer_shall_be_build_on_non_win32 Kim Kulling 2022-02-21 15:39:11 +01:00
  • caaeef2b56 Update CMakeLists.txt Kim Kulling 2022-02-21 15:17:23 +01:00
  • a34688230d Merge pull request #4393 from TerenceRussell/master v5.2.2 Kim Kulling 2022-02-20 20:14:21 +01:00
  • 52b106bf7e Merge branch 'master' into master Kim Kulling 2022-02-20 19:04:32 +01:00
  • eed5570c39 Merge pull request #4399 from assimp/kimkulling/fix_typo_in_cmake Kim Kulling 2022-02-20 18:45:06 +01:00
  • 3e7294feeb Merge branch 'master' into kimkulling/fix_typo_in_cmake Kim Kulling 2022-02-20 15:33:54 +01:00
  • 2c33ed1087 Merge pull request #4397 from youkeyao/issue_3191 Kim Kulling 2022-02-20 15:32:41 +01:00
  • b625961197 Merge branch 'master' into issue_3191 Kim Kulling 2022-02-20 15:14:46 +01:00
  • 03f44cd983 Merge branch 'master' into kimkulling/fix_typo_in_cmake Kim Kulling 2022-02-20 14:17:27 +01:00
  • 5c53726c8e Merge pull request #4394 from BA7LYA/master Kim Kulling 2022-02-20 14:07:49 +01:00
  • 96522bc114 Update CMakeLists.txt Kim Kulling 2022-02-20 14:06:11 +01:00
  • b825740df7 Merge branch 'master' into master Kim Kulling 2022-02-20 12:53:26 +01:00
  • f952100dbb Merge pull request #4398 from assimp/kimkulling-patch-1 Kim Kulling 2022-02-20 12:19:06 +01:00
  • 14874d26f4 Fix stat for 32-biut linuxes Kim Kulling 2022-02-20 11:53:26 +01:00
  • ad766cb738 update the calculation and orthogonalization for bitangent youkeyao 2022-02-20 17:10:20 +08:00
  • efc60076dc udpate build script to fit "Visual Studio 16 2019" Generator ChenJunshuai 2022-02-18 19:01:47 +08:00
  • 17123ed4a1 Add support for bump -bm (bump/normal multiplier) Terence Russell 2022-02-17 22:10:46 -07:00
  • dff3620138 Merge pull request #4391 from jcfr/fix-assimp-target-install-rule-fully-specifying-components Kim Kulling 2022-02-17 23:13:43 +01:00
  • 33a48c6ca6 cmake: Fix assimp target install rule fully specifying component Jean-Christophe Fillion-Robin 2022-02-17 05:47:34 -05:00
  • 510504a2c6 Merge pull request #4387 from assimp/kimkulling/fbx_use_ai_epsilon Kim Kulling 2022-02-16 22:38:34 +01:00
  • 9bf5d01469 Fix invalid initialization of constexpr. Kim Kulling 2022-02-16 21:22:35 +01:00
  • 9e23d771bc Fix invalid initialization of constexpr. Kim Kulling 2022-02-16 21:19:17 +01:00
  • 76a7614c4b Adapt ai_epsilon to code Kim Kulling 2022-02-16 20:07:27 +01:00
  • 50d7e6fc61 Add definition for skeleton Kim Kulling 2022-02-16 00:18:32 +01:00