Commit Graph

  • 072aee7cbe Merge branch 'master' into add-step-extension Kim Kulling 2021-05-04 22:35:21 +02:00
  • 38df0f4376 Merge pull request #3834 from JC3/patch-4 Kim Kulling 2021-05-04 22:33:48 +02:00
  • b57ce004f8 reduced FBX string bloat Krishty 2021-05-04 09:45:26 +02:00
  • f3c18556d1 reduced OpenGEX string bloat Krishty 2021-05-04 22:03:44 +02:00
  • 7b6dab5e20 reduced DXF string bloat Krishty 2021-05-03 21:52:48 +02:00
  • 2a126f9f62 reduced Ogre string bloat Krishty 2021-05-03 21:46:53 +02:00
  • dc6fa58814 Merge branch 'master' into patch-4 Kim Kulling 2021-05-04 21:08:56 +02:00
  • be85eac703 Merge pull request #3877 from olsoneric/olsoneric-issue_2339_py_cant_load_obj Kim Kulling 2021-05-04 21:08:35 +02:00
  • 875acc5166 Merge branch 'master' into patch-4 Kim Kulling 2021-05-04 20:59:06 +02:00
  • f17d58cadd Use POINTER(c_char) for binary data with pyassimp Eric Olson 2021-05-04 13:38:38 -05:00
  • 8ad9c937f1 enabled debug information in MSVC release build Krishty 2021-05-04 19:10:24 +02:00
  • cd0fd30821 Merge pull request #3819 from vfxgordon/fbxBlendshapes Kim Kulling 2021-05-04 17:44:32 +02:00
  • e85a69a960 Update D3MFImporter.cpp Kim Kulling 2021-05-04 15:31:07 +02:00
  • 4231a86ad8 Merge branch 'master' into fbxBlendshapes vfxgordon 2021-05-04 06:22:22 -07:00
  • 7690f92c81 Fix version of strnlen kimkulling 2021-05-04 14:48:39 +02:00
  • 47cacf8aa6 Merge branch 'master' into optimize_3mf_strings Kim Kulling 2021-05-04 14:42:16 +02:00
  • ee5170c18a - fix security issue kimkulling 2021-05-04 14:40:25 +02:00
  • 9c44c0ab2b Merge branch 'master' into remove-useless-scaling-prototype Kim Kulling 2021-05-04 13:02:00 +02:00
  • ff18354997 Merge pull request #3869 from assimp/optimize_3mf_strings Kim Kulling 2021-05-04 12:46:38 +02:00
  • 0e17939e8d Use const char* const kimkulling 2021-05-04 12:09:38 +02:00
  • 33a85e280f Merge branch 'master' into optimize_3mf_strings Kim Kulling 2021-05-04 11:47:11 +02:00
  • 55fd820ed7 use const chars kkulling 2021-05-04 10:57:30 +02:00
  • 70ba2e9e74 Merge pull request #3805 from krishty/fix-scale-msg Kim Kulling 2021-05-04 09:18:12 +02:00
  • 39522178aa Merge branch 'master' into fix-scale-msg Kim Kulling 2021-05-04 08:13:12 +02:00
  • 79802ad836 Merge pull request #3796 from krishty/fix-file-detection Kim Kulling 2021-05-04 07:54:09 +02:00
  • 88d64388f8 Update AMFImporter.cpp Kim Kulling 2021-05-03 20:57:17 +02:00
  • b87f67db4c Add missing include Kim Kulling 2021-05-03 20:49:14 +02:00
  • 60b99501a9 Merge branch 'master' into new-file-detection Kim Kulling 2021-05-03 20:44:27 +02:00
  • f91b439f79 preserve UV Stream names in FBX files Tom spot Callaway 2021-05-03 13:40:31 -04:00
  • e7211790fb PBR material support Tom spot Callaway 2021-05-03 13:27:52 -04:00
  • fe5a23e110 fixed bloat in SIB importer Krishty 2021-05-03 17:01:59 +02:00
  • 9ae3e88f6c Merge branch 'master' into fbxBlendshapes vfxgordon 2021-05-03 07:40:25 -07:00
  • f29828f657 Merge branch 'master' into fix-file-detection Kim Kulling 2021-05-02 19:41:33 +02:00
  • 71c48581f3 Merge pull request #3852 from krishty/3ds-namespace Kim Kulling 2021-05-02 19:41:04 +02:00
  • 9e27afe353 Merge branch 'master' into 3ds-namespace Kim Kulling 2021-05-02 17:38:29 +02:00
  • afdec791a6 Merge pull request #3795 from assimp/kimkulling-patch-3 Kim Kulling 2021-05-02 17:38:16 +02:00
  • e278673fe7 Merge branch 'master' into 3ds-namespace Kim Kulling 2021-05-02 15:08:11 +02:00
  • e73a2ed5e0 style fix: namespace instead of class with public static members Krishty 2021-05-01 23:20:37 +02:00
  • 6c429a9d82 Merge branch 'master' into kimkulling-patch-3 Kim Kulling 2021-05-01 19:29:37 +02:00
  • 65a2b98b86 updated C4D importer to use the Cineware SDK Krishty 2021-05-01 18:46:12 +02:00
  • c2d3d22271 Fix crash in CanRead when file can not be opened. Jason C 2021-05-01 10:58:29 -04:00
  • b516d940b6 Merge pull request #3826 from krishty/fix-3ds-matrix Kim Kulling 2021-05-01 12:02:24 +02:00
  • 78132d666f Merge branch 'master' into fix-3ds-matrix Kim Kulling 2021-05-01 11:34:33 +02:00
  • f538b96e82 Merge pull request #3788 from BaldricS/SceneCombiner_Memory_Leaks Kim Kulling 2021-05-01 11:07:34 +02:00
  • 7843b24e03 Merge branch 'master' into SceneCombiner_Memory_Leaks Kim Kulling 2021-05-01 09:16:06 +02:00
  • d28e2e0a39 Merge pull request #3775 from diiigle/patch-1 Kim Kulling 2021-05-01 09:15:34 +02:00
  • eab1c9c3c0 add AI_CONFIG_IMPORT_MD3_LOAD_SHADERS bool option the purpose is use of this loader with idtech3 FS this requires full original material name, which euqals to Q3 shader path result of deduction is not usable inside Q3 FS at all option in general is "do not tinker with the path" Garux 2021-05-01 00:27:28 +03:00
  • 813b64ef52 corrected M3D_EXP_NOFACE test contriteobserver 2021-04-30 21:51:02 -07:00
  • bf653b4bd6 Merge branch 'M3DasciiByDefault' of https://github.com/contriteobserver/assimp into M3DasciiByDefault contriteobserver 2021-04-30 21:28:54 -07:00
  • e51bb1e77e fixed signed/unsigned mismatch warning contriteobserver 2021-04-30 21:26:57 -07:00
  • 694f4c2e34 Merge branch 'master' into M3DasciiByDefault contriteobserver 2021-04-30 21:12:48 -07:00
  • 302e47efc1 Merge branch 'master' into M3DasciiByDefault contriteobserver 2021-04-30 21:11:23 -07:00
  • af0aca796e now compiling M3D ASCII support by default contriteobserver 2021-04-30 21:07:01 -07:00
  • 07257f4c66 Merge branch 'master' into patch-4 Jason C 2021-04-30 22:23:23 -04:00
  • 55abc49d6d improve md3::Q3 shader::cull keyword support only use nonstandard winding order with cull back; might be excess too, since engine doesn't support this Garux 2021-04-30 22:59:05 +03:00
  • 0b7ebef497 fix path separator in md3 shader loading Garux 2021-04-30 22:51:21 +03:00
  • 2d51efa002 Merge branch 'master' into patch-1 Kim Kulling 2021-04-30 21:14:26 +02:00
  • 911321b97b Merge pull request #3765 from krishty/md2-mdc-const Kim Kulling 2021-04-30 21:12:36 +02:00
  • 2feda5b4b2 Merge branch 'master' into md2-mdc-const Kim Kulling 2021-04-30 20:10:45 +02:00
  • 9b36f62cb2 Merge pull request #3764 from krishty/empty-string-style Kim Kulling 2021-04-30 20:10:18 +02:00
  • 60f030ccbc Merge branch 'master' into empty-string-style Kim Kulling 2021-04-30 19:50:38 +02:00
  • 9ef84a67f7 Merge pull request #3846 from assimp/issue_3831_update_zip Kim Kulling 2021-04-30 18:00:55 +02:00
  • feeb89a1dd closes https://github.com/assimp/assimp/issues/3831 : update zip Kim Kulling 2021-04-30 16:49:15 +02:00
  • 149224091f support missing closing brace in material list after Ascii Scene Exporter v2.51 Garux 2021-04-30 10:37:06 +03:00
  • 57091d761e Merge branch 'master' into md2-mdc-const Kim Kulling 2021-04-30 00:56:50 +02:00
  • 0b92abe9b4 Merge branch 'master' into empty-string-style Kim Kulling 2021-04-30 00:54:57 +02:00
  • 5298ed8f9e Merge branch 'master' into fbxBlendshapes vfxgordon 2021-04-29 15:21:16 -07:00
  • 73e05ab6d3 Merge branch 'master' into add-step-extension Kim Kulling 2021-04-30 00:13:32 +02:00
  • edf12bd357 fix md2 orientation Garux 2021-04-29 20:14:57 +03:00
  • 666b5eff76 added .step extension to IFC loader Krishty 2021-04-29 21:29:10 +02:00
  • 3717e66fae consider aiProcess_FlipWindingOrder in aiProcess_GenNormals & aiProcess_GenSmoothNormals Garux 2021-04-29 19:57:57 +03:00
  • 4798ff3882 fix hl1 mdl orientation, tex coords, face windings order Garux 2021-04-29 19:51:03 +03:00
  • ebf5ef9a4b consider pScene->mRootNode->mTransformation set by some importers while using AI_CONFIG_PP_PTV_ROOT_TRANSFORMATION Garux 2021-04-29 20:02:20 +03:00
  • db142da571 orient mdc correctly Garux 2021-04-29 19:44:06 +03:00
  • f523b1e0d7 Merge branch 'master' into SceneCombiner_Memory_Leaks Scott Baldric 2021-04-29 08:52:51 -05:00
  • 975de81ab6 Merge branch 'master' into patch-4 Jason C 2021-04-28 22:23:17 -04:00
  • 96d0524fab Merge pull request #3787 from ms-maxvollmer/ms-maxvollmer/importer_fixes Kim Kulling 2021-04-28 20:42:06 +02:00
  • 41e5acf060 Merge branch 'master' into ms-maxvollmer/importer_fixes Kim Kulling 2021-04-28 20:26:38 +02:00
  • 7dd870f88c Merge pull request #3833 from assimp/kimkulling-fix_debug_crash Kim Kulling 2021-04-28 20:26:30 +02:00
  • 9a0b703db1 Merge branch 'master' into ms-maxvollmer/importer_fixes Kim Kulling 2021-04-28 20:25:10 +02:00
  • cf498c979a ASSIMP_ENABLE_DEV_IMPORTERS env var to control registration of wip importers; applied to X3D Jason C 2021-04-28 11:16:49 -04:00
  • 6abdd0cd3e Fix crash when reading 0 bytes Kim Kulling 2021-04-28 16:38:22 +02:00
  • 8e3fe6b30b Merge branch 'master' into SceneCombiner_Memory_Leaks Scott Baldric 2021-04-28 09:16:02 -05:00
  • 260cc6bd26 reverted regression in 3DS transformation (issue #3802) Krishty 2021-04-28 01:02:24 +02:00
  • 74577ae3c7 Merge pull request #3822 from JC3/patch-2 Kim Kulling 2021-04-27 22:08:06 +02:00
  • 30f55dcbbf Merge branch 'master' into patch-2 Kim Kulling 2021-04-27 20:30:06 +02:00
  • 9504957534 Merge pull request #3821 from JC3/patch-1 Kim Kulling 2021-04-27 20:29:21 +02:00
  • 3acd42c22e Remove newline from name of Blender importer. Jason C 2021-04-26 20:27:28 -04:00
  • 708d124745 Update aiProcess_PreTransformVertices docs to match behavior. Jason C 2021-04-26 19:42:22 -04:00
  • 64da2a4315 Merge remote-tracking branch 'upstream/master' into fbxBlendshapes Gordon Chapman 2021-04-26 13:51:22 -07:00
  • a5d0e99548 Fixed error in blendShapeChannel Weighting Gordon Chapman 2021-04-26 12:19:20 -07:00
  • e1d6e1f377 Merge branch 'master' into ms-maxvollmer/importer_fixes Max Vollmer (Microsoft Havok) 2021-04-26 14:53:32 +01:00
  • ee8d1b0417 SimpleTexturedDirectx11: embedded texture loading fixes Eric Wasylishen 2021-04-24 14:13:51 -06:00
  • 5c64a4dc1e devirtualized a function that is called once and never overridden Krishty 2021-04-24 18:33:57 +02:00
  • e6a47d93c2 removed dead code from 0d29203e24 Krishty 2021-04-24 13:29:15 +02:00
  • 7cd6ddad8a Merge branch 'master' into fix-scale-msg Kim Kulling 2021-04-24 12:44:42 +02:00
  • afe947d5db fixed malformatted message Krishty 2021-04-24 12:38:31 +02:00
  • 628cba9490 fixed warning Krishty 2021-04-24 00:44:50 +02:00
  • b00de10eb3 Simplified importer search and fixed a few bugs Krishty 2021-04-24 00:17:50 +02:00
  • cd3e283bcb Merge branch 'master' into kimkulling-patch-3 Kim Kulling 2021-04-23 18:03:40 +02:00