Commit Graph

  • 2acb513732 Merge branch 'master' into issue-1167 Kim Kulling 2018-05-02 15:45:52 +02:00
  • 18ad80fd20 Merge pull request #1929 from Trylz/fix_fbx_empty_names Kim Kulling 2018-05-02 15:44:00 +02:00
  • 7bb2d6271b Merge branch 'master' into fix_fbx_empty_names Kim Kulling 2018-05-02 14:57:08 +02:00
  • 9385f83ea3 Merge pull request #1931 from kwuerl/issue-1923 Kim Kulling 2018-05-02 14:45:04 +02:00
  • 27d41442c9 Merge branch 'master' into fix_gltf2_export_componentType_error wuxq 2018-05-02 15:28:57 +08:00
  • 5c5226a98c Merge branch 'master' into issue-1923 Kim Kulling 2018-05-01 21:10:52 +02:00
  • 66f77e93ba Merge pull request #1935 from assimp/issue_842 Kim Kulling 2018-05-01 17:11:33 +02:00
  • 1679c8b08e STL: reenable unittest. Kim Kulling 2018-05-01 16:03:56 +02:00
  • 037a213bb4 STL-Exporter: fix division by zero in normalize method during update Kim Kulling 2018-05-01 15:06:56 +02:00
  • eced86b949 some refactorings. Kim Kulling 2018-05-01 13:41:39 +02:00
  • 2c47717ca6 Introduce export with test for point clouds. Kim Kulling 2018-05-01 13:28:53 +02:00
  • 2247513064 Fix for TravisCI Korbinian Würl 2018-05-01 11:23:38 +02:00
  • 9f835ea843 closes https://github.com/assimp/assimp/issues/842: experimental suppor for ascii stl pointcloud export. Kim Kulling 2018-05-01 09:06:22 +02:00
  • 4b7b692e5e Fix Issue #1923: OBJ Exporter can't correctly export vertex colors Korbinian Würl 2018-04-30 16:27:34 +02:00
  • 9cfdb8d365 Fixed test .obj file: OBJ Vertex Colors are expected to be floats 0-1 Korbinian Würl 2018-04-30 16:23:29 +02:00
  • 9e484daa65 Unit test for Issue #1923: OBJ Exporter can't correctly export vertex colors Korbinian Würl 2018-04-30 15:51:48 +02:00
  • 6fb9ebe3c8 Apply fix Trylz 2018-04-28 23:34:07 -04:00
  • 7a7a706ebd Merge branch 'master' into fix_gltf2_export_componentType_error wuxq 2018-04-29 11:29:43 +08:00
  • 814b56e5e2 multi joint has bug with ReplaceData wuxq 2018-04-28 15:05:21 +08:00
  • 1533aec21c Fix ply exporter to be conformant to spec respecting vertex colors. Korbinian Würl 2018-04-27 22:11:36 +02:00
  • af8f9a97a9 Merge branch 'master' into fix/blendshapes_join_identical_vertices_optimization_flag_v2 Sebastian Matusik 2018-04-27 12:45:47 +01:00
  • 1f9d6f1ec4 Fix for blendshapes import when using the JoinIdenticalVertices optimization flag Sebastian Matusik 2018-04-26 17:34:27 +01:00
  • 410e9d4b3f Merge pull request #1918 from assimp/use_log_macros Kim Kulling 2018-04-26 22:47:24 +02:00
  • e2d0c07791 Merge branch 'master' into use_log_macros Kim Kulling 2018-04-26 22:02:18 +02:00
  • b877b3e10e use correct log macro. Kim Kulling 2018-04-26 22:01:41 +02:00
  • 78d04c137d Fix for blendshapes import when using the JoinIdenticalVertices optimization flag Sebastian Matusik 2018-04-26 17:34:27 +01:00
  • 6a311210e7 fix another bug of misusage of the log macros. kimkulling 2018-04-26 17:01:22 +02:00
  • 8626b185fb Fix misused log macros + compiler warnings. kimkulling 2018-04-26 16:38:42 +02:00
  • c299755721 DXF: fix macro issues. kimkulling 2018-04-26 16:13:57 +02:00
  • a5e14db19b fix invaid macro usage. kimkulling 2018-04-26 15:41:31 +02:00
  • 68288782e4 Merge branch 'use_log_macros' of https://github.com/assimp/assimp into use_log_macros kimkulling 2018-04-26 15:18:24 +02:00
  • 3d589d8fc8 Merge pull request #1917 from wuxq/fix_gltf2_export_componentType_error Kim Kulling 2018-04-26 15:06:16 +02:00
  • 75c7b15b55 Fix c++11 usage. kimkulling 2018-04-26 15:05:49 +02:00
  • 3d79472172 fix the build. kimkulling 2018-04-26 14:36:59 +02:00
  • dd7d0943f6 Update glTF2Asset.inl Kim Kulling 2018-04-26 14:24:00 +02:00
  • 8f26b9d840 Merge branch 'master' into use_log_macros Kim Kulling 2018-04-26 14:13:04 +02:00
  • 30c20eb5fc INtroduce new log macros. kimkulling 2018-04-26 14:10:18 +02:00
  • 972fffe70b Merge branch 'master' into fix_gltf2_export_componentType_error Kim Kulling 2018-04-26 13:40:49 +02:00
  • 90b4b6a18d Merge pull request #1916 from LoicFr/master Kim Kulling 2018-04-26 13:37:30 +02:00
  • f6af6ded1f fixed the bug of export gltf2, the JOINTS_0 componentType is Incorrect wuxiaoqian 2018-04-26 11:03:50 +08:00
  • 6b4caa0f12 fix export gltf2, The JOINTS_0 componentType is incorrect wuxiaoqian 2018-04-26 10:56:56 +08:00
  • 1755dd325c Merge branch 'master' into master Kim Kulling 2018-04-25 21:27:28 +02:00
  • f7be098bb2 Merge pull request #1915 from nuclearsandwich/use-install-prefix-as-root-dir Kim Kulling 2018-04-25 21:27:02 +02:00
  • a8077baed5 Add vertex color support to glTF2 export Loïc Fricoteaux 2018-04-25 11:37:56 +02:00
  • 4ee34fbce6 Merge branch 'master' into use-install-prefix-as-root-dir Kim Kulling 2018-04-24 20:29:02 +02:00
  • a54d114245 Merge pull request #1913 from Binero/patch-1 Kim Kulling 2018-04-24 20:13:35 +02:00
  • 0fdb79871f Use CMAKE_INSTALL_PREFIX as ASSIMP_ROOT_DIR. Steven! Ragnarök 2018-04-24 10:12:30 -07:00
  • 2d6782cc9f Changed 'souces' to 'sources'. Jeroen Bollen 2018-04-24 16:44:22 +02:00
  • 620182770d Merge pull request #1910 from sacereda/master Kim Kulling 2018-04-24 14:53:24 +02:00
  • 43dedb6e09 unit test: missing mNumIndices Sergio Acereda 2018-04-23 12:23:12 +02:00
  • ce6a5e5d56 ImproveCacheLocality crashes if non triangular faces Sergio Acereda 2018-04-23 11:33:48 +02:00
  • 0e15b25cd1 Next log call changes. kimkulling 2018-04-20 16:23:24 +02:00
  • b6f29bf54f Add usage of log macros, next files. kimkulling 2018-04-19 17:21:21 +02:00
  • 066349f36b Add usage of log macros. kimkulling 2018-04-19 16:48:43 +02:00
  • bdbad4c64f Merge pull request #1903 from assimp/issue_1784 Kim Kulling 2018-04-19 09:48:50 +02:00
  • f2833539d7 closes https://github.com/assimp/assimp/issues/1784: change so.name to keep track of the minor version of the lib. kimkulling 2018-04-19 08:52:21 +02:00
  • 3f26a35a16 Merge pull request #1902 from terziman/master Kim Kulling 2018-04-18 15:14:06 +02:00
  • c797f16b0e In IFC, fixed parser to avoid interpretation of '##' in string as identifiers Leo Terziman 2018-04-18 11:53:49 +02:00
  • 6ca8423e24 Improved memory footprint of IFC loading by avoiding keeping in cache duplicated indices. Leo Terziman 2018-04-18 11:12:40 +02:00
  • fce4d0cee7 Merge pull request #1899 from arkeon7/ColladaTexture Kim Kulling 2018-04-13 16:32:03 +02:00
  • f235646030 Correction on Collada parser missing textures when the image is in CDATA <image id="image-1404706686"> <init_from><![CDATA[textures\burgundy.png]]></init_from> </image> Arkeon 2018-04-13 09:36:01 +02:00
  • 45892d7fe9 Merge pull request #1898 from assimp/move_logtools Kim Kulling 2018-04-12 22:00:28 +02:00
  • e57394a772 move log tools from blender to logger interface. kimkulling 2018-04-12 16:09:01 +02:00
  • 9fd6744f93 Merge pull request #1884 from assimp/isue_1621 Kim Kulling 2018-04-12 00:29:15 +02:00
  • 096f7e272a Merge branch 'master' into isue_1621 Kim Kulling 2018-04-12 00:05:38 +02:00
  • 42dcf8c14c Add missing test DXF-file. Kim Kulling 2018-04-11 23:11:13 +02:00
  • bb5607d1ae Merge pull request #1896 from assimp/issue_1893 Kim Kulling 2018-04-11 21:44:45 +02:00
  • 5319974fe1 Use correct check to do a tokensearch. Kim Kulling 2018-04-11 21:16:20 +02:00
  • 0f9268bf01 Merge branch 'master' into issue_1893 Kim Kulling 2018-04-11 20:27:05 +02:00
  • 2208a23410 Merge pull request #1895 from assimp/issue_1894 Kim Kulling 2018-04-11 20:26:53 +02:00
  • da073f1270 closes https://github.com/assimp/assimp/issues/1893: fix mem leak in glft2Importer. kimkulling 2018-04-11 17:22:31 +02:00
  • 9ca32b2373 closes https://github.com/assimp/assimp/issues/1894: use mesh name to name exported obj node. kimkulling 2018-04-11 17:04:49 +02:00
  • 6a0dc071a9 Merge pull request #1887 from assimp/develop_kimkulling Kim Kulling 2018-04-08 23:59:21 +02:00
  • b8a92a7e97 Merge branch 'master' into develop_kimkulling Kim Kulling 2018-04-08 21:45:36 +02:00
  • f096843c45 Merge branch 'master' into umw_dev Kim Kulling 2018-04-08 21:42:10 +02:00
  • c41d459e21 add missing constructor to ensure RTTI Kim Kulling 2018-04-08 21:27:18 +02:00
  • 483541ee25 Merge branch 'master' into isue_1621 Kim Kulling 2018-04-06 20:54:01 +02:00
  • 183224f045 closes https://github.com/assimp/assimp/issues/1621: add file check for dxf file without extensions. Kim Kulling 2018-04-06 20:51:07 +02:00
  • 4a645223f8 Merge pull request #1871 from assimp/develop_kimkulling Kim Kulling 2018-04-06 18:49:21 +02:00
  • 44c62042f3 Merge branch 'master' into develop_kimkulling Kim Kulling 2018-04-06 18:13:04 +02:00
  • 0a3fb04b04 Update ScenePrivate.h Kim Kulling 2018-04-06 16:23:59 +02:00
  • c269e9329e Merge pull request #1882 from assimp/issue_1881 Kim Kulling 2018-04-06 13:01:05 +02:00
  • 3bd80a2537 closes https://github.com/assimp/assimp/issues/1881: make template-based get and put in streamreader/writer public. Kim Kulling 2018-04-06 12:05:30 +02:00
  • 32b466941b Add missig docs and fix some small review findings. Kim Kulling 2018-04-06 12:01:22 +02:00
  • d17cf76c85 Fix compiler warning in unit test: unused variable. Kim Kulling 2018-04-06 11:16:52 +02:00
  • 08ddd5c296 Export missig symbols. Kim Kulling 2018-04-06 10:53:32 +02:00
  • a636146cf2 Merge branch 'master' into develop_kimkulling Kim Kulling 2018-04-06 10:34:46 +02:00
  • 5fbffd394e Merge pull request #1868 from EdwardAndrew/issue-1219 Kim Kulling 2018-04-06 10:33:42 +02:00
  • a3cb1ef55e Merge branch 'master' into develop_kimkulling Kim Kulling 2018-04-06 10:32:35 +02:00
  • 40f5f19ce0 Merge branch 'master' into issue-1219 Kim Kulling 2018-04-05 15:24:40 +02:00
  • 6403dc8012 Merge pull request #1879 from DMJC/master Kim Kulling 2018-04-05 15:24:01 +02:00
  • 8cb25328cb committing all changes. James Carthew 2018-04-05 17:50:30 +10:00
  • 4254142575 Updated GLView to draw with white lighting after drawCoordSystem(). James Carthew 2018-04-05 06:37:18 +10:00
  • b8025d92fc Merge branch 'master' into issue-1219 Edward Andrew 2018-04-04 21:12:52 +01:00
  • 0e945b5581 Merge branch 'master' into develop_kimkulling Kim Kulling 2018-04-04 16:32:46 +02:00
  • c232c4bfb3 Add missing file to fix the build. Kim Kulling 2018-04-04 16:32:18 +02:00
  • 24880740aa Merge pull request #1876 from DMJC/master Kim Kulling 2018-04-04 16:30:42 +02:00
  • 6147a4f50d Updated COB importer plugin to flip normals. James Carthew 2018-04-04 08:08:28 +10:00
  • 06579e87f7 Merge pull request #1872 from asmaloney/asm_master Kim Kulling 2018-04-03 09:58:35 +02:00
  • 7faf638cca Add links to some file format info in readme Andy Maloney 2018-04-02 14:41:02 -04:00