Commit Graph

  • 1126f8dade Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2016-11-10 16:26:57 +01:00
  • 1c5030c642 Remove some whitespaces. Kim Kulling 2016-11-10 16:26:17 +01:00
  • b04069b441 Merge pull request #1062 from byteblob/patch-1 Kim Kulling 2016-11-10 13:47:19 +01:00
  • 604b4e9723 Make travis build faster. Kim Kulling 2016-11-10 10:33:07 +01:00
  • c21c70ade6 added void to aiGetErrorString's args byteblob 2016-11-09 22:43:01 +01:00
  • 888ea72f20 Merge pull request #1061 from assimp/optimized_faces_in_obj Kim Kulling 2016-11-09 20:52:22 +01:00
  • c07aee21b7 Fix build Kim Kulling 2016-11-09 20:18:26 +01:00
  • 568b459e24 Fix review findings. Kim Kulling 2016-11-09 20:16:45 +01:00
  • ae956044aa ObjImporter: remove unnecessary allocations of std::vector in obj-specific face. Kim Kulling 2016-11-09 20:09:45 +01:00
  • 1d08c9e2e2 Merge pull request #1060 from assimp/issue_1059 Kim Kulling 2016-11-08 21:31:47 +01:00
  • 9f96126362 ObjParser: remove dead code. Kim Kulling 2016-11-08 20:35:21 +01:00
  • 5ff1c39e02 Obj-Parser: Fix performance issue. Kim Kulling 2016-11-08 20:34:55 +01:00
  • 67febc41c6 QtViewer: some refactorings. Kim Kulling 2016-11-08 14:53:52 +01:00
  • 6d58926046 Code reformatting. Kim Kulling 2016-11-08 10:38:57 +01:00
  • 1aafe6287c Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2016-11-07 17:20:27 +01:00
  • 8ffd94937e Fix BlenderDNA for clang cross compiler. Kim Kulling 2016-11-07 17:19:49 +01:00
  • a43634ebd0 Fix build: Kim Kulling 2016-11-06 20:39:33 +01:00
  • d4223d1fce closes https://github.com/assimp/assimp/issues/105://github.com/assimp/assimp/issues/1057 Kim Kulling 2016-11-06 19:36:37 +01:00
  • cc7b7723c1 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2016-11-05 18:41:52 +01:00
  • 499886f89e ScenePreprocessor: fix invalid index counter. Kim Kulling 2016-11-05 18:41:19 +01:00
  • eaa494ed55 Merge pull request #1056 from AndrzejKozik/patch-1 Kim Kulling 2016-11-04 18:51:55 +01:00
  • dcb7478785 Update FBXConverter.cpp AndrzejKozik 2016-11-04 09:20:04 +01:00
  • a074ca58b3 Keys interpolation fix AndrzejKozik 2016-11-04 08:48:14 +01:00
  • dfaea27dfc MaterialSystem: fix some findings. Kim Kulling 2016-11-03 23:29:03 +01:00
  • c849e0108d Merge pull request #1055 from assimp/issue_957 Kim Kulling 2016-11-03 19:11:56 +01:00
  • 02e038bbb6 Fix compiler warnings related to issue 957. Kim Kulling 2016-11-03 18:37:02 +01:00
  • 6c7accfb3d Merge pull request #1054 from mgerhardy/patch-2 Kim Kulling 2016-11-03 12:35:56 +01:00
  • 413116a73b Merge pull request #1053 from rdb/patch-2 Kim Kulling 2016-11-02 20:12:59 +01:00
  • b30dc8ffc9 Fixes compile issue for 3ds exporter Martin Gerhardy 2016-11-02 19:54:53 +01:00
  • b5c7c9c3ac Fix compile error with MSVC 2015 rdb 2016-11-02 18:42:16 +01:00
  • 3e05d13827 Merge pull request #1048 from tomacd/keep_materials_names Kim Kulling 2016-10-31 09:42:45 +01:00
  • fcac614ad0 Blender: fix compiler warning: FAIL already defined. Kim Kulling 2016-10-30 19:21:38 +01:00
  • 8b2f1085c7 Merge pull request #1043 from assimp/new_obj_stream_handling Kim Kulling 2016-10-30 12:30:52 +01:00
  • 337990510c Fix rounding issue in unittest for block calculation. Kim Kulling 2016-10-30 11:16:31 +01:00
  • 810fc405a8 Fix build. Kim Kulling 2016-10-30 09:06:45 +01:00
  • 293654fe7c Fix unittest. Kim Kulling 2016-10-30 08:55:11 +01:00
  • b9261f01a3 Obj-Stream-Handling: fix compiler-errors and warnings. Kim Kulling 2016-10-29 21:41:24 +02:00
  • 186f3f091f Merge branch 'new_obj_stream_handling' of https://github.com/assimp/assimp into new_obj_stream_handling Kim Kulling 2016-10-29 20:07:53 +02:00
  • 8bae6ad7b7 Add missing license info. Kim Kulling 2016-10-29 19:11:00 +02:00
  • b13c30f50e Obj: Fix some small issues Kim Kulling 2016-10-29 19:07:30 +02:00
  • 8e8757f800 Keep original materials names after RemoveRedundant materials process and export to collada tomacd 2016-10-27 19:23:43 +02:00
  • 949a27a743 New streaming interface: fix build. Kim Kulling 2016-10-22 23:34:56 +02:00
  • 54c5acd02d Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2016-10-22 22:15:00 +02:00
  • 79504c08d9 QtViewer: fix review findings. Kim Kulling 2016-10-22 22:14:01 +02:00
  • cbe2e9af49 Merge branch 'master' into new_obj_stream_handling Kim Kulling 2016-10-22 21:04:02 +02:00
  • d3a3bd9c12 BUgfixes regarding filepos setupBUgfixes regarding filepos setup. Kim Kulling 2016-10-22 21:03:11 +02:00
  • 33e370a8b7 Obj-Stream-Handling: fix readin of linewise import. Kim Kulling 2016-10-21 21:14:35 +02:00
  • 1724cc9e66 Remove redundant file. Kim Kulling 2016-10-21 19:44:31 +02:00
  • 50803b897c Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2016-10-21 19:43:56 +02:00
  • 3b61ff4cf2 Qt5-based Viewer: fix build. Kim Kulling 2016-10-21 12:50:41 +02:00
  • fe0cfc52bc Q3BSP-Loader: reformat include. Kim Kulling 2016-10-20 22:25:39 +02:00
  • af54cb8a29 Q3BSP: fix license dates. Kim Kulling 2016-10-20 17:04:37 +02:00
  • 6a31e3528e Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2016-10-20 16:43:38 +02:00
  • 91e833056e Q3BSP-Importer: remove commented code. Kim Kulling 2016-10-20 16:42:00 +02:00
  • b0f09ee6e2 Merge pull request #903 from dontbmh/upstream Kim Kulling 2016-10-20 16:18:30 +02:00
  • 74ab4afd01 Merge pull request #1042 from VeganPower/Fix_988 Kim Kulling 2016-10-19 16:03:53 +02:00
  • bac28061ea 3MF: fix nullptr access. Kim Kulling 2016-10-18 21:16:44 +02:00
  • 8fd030f23d Merge pull request #1040 from johnmaf/bugfix/obj-mtllib-parse Kim Kulling 2016-10-18 17:09:06 +02:00
  • acd2802f22 Check for std::string::npos before applying std::string::substr John Senneker 2016-10-18 10:48:47 -04:00
  • a54e42cb5a Some more fixes. Kim Kulling 2016-10-18 14:02:58 +02:00
  • 4b15dfd9af Fix OBJ parser mtllib statement parsing bug. John Senneker 2016-10-17 18:48:04 -04:00
  • 5cd16a0aa6 Merge pull request #1034 from ascandal/feature/gltf-compact-skins Kim Kulling 2016-10-17 21:45:50 +02:00
  • ea0424de18 Merge pull request #1037 from ystreet/cfileio-leaks Kim Kulling 2016-10-17 17:29:38 +02:00
  • fe1af5af7d Merge pull request #1038 from ystreet/cfileio-defs Kim Kulling 2016-10-17 17:28:04 +02:00
  • 862dfd5a05 Merge pull request #1032 from ashdnazg/master Kim Kulling 2016-10-17 17:26:32 +02:00
  • cbcaa107eb cfileio: fix leaks by not closing files in the destructor Matthew Waters 2016-10-18 00:28:14 +11:00
  • 6ed1bcd41b cfileio: fix function typedefs to have struct/enum Matthew Waters 2016-10-18 00:20:28 +11:00
  • 09ad67f469 3MF-Importer: remove unused variable. Kim Kulling 2016-10-16 17:14:22 +02:00
  • 6ce2a37b82 merge upstream/master and fix conflicts Angelo Scandaliato 2016-10-15 18:12:02 -07:00
  • fcf2d6357e check if bones exist before creating skin Angelo Scandaliato 2016-10-15 17:21:55 -07:00
  • 5cb4df80ad C++11-combat: hopefully the last std::to_string to replace. Kim Kulling 2016-10-15 21:45:58 +02:00
  • 46d78f57d5 OpenGEXImporter: fix compiler warning. Kim Kulling 2016-10-15 21:45:09 +02:00
  • 7681089abc C++11-Combat: last replacements of std::to_string. Kim Kulling 2016-10-15 21:30:02 +02:00
  • e0dde73018 C++11-combat: replace more std::to_string by assimp-specific to_string Kim Kulling 2016-10-15 21:25:16 +02:00
  • b90669c45e C++11: Replace std::to_string by assimp-specific implementation. Kim Kulling 2016-10-15 20:36:51 +02:00
  • a84bf869c2 replace more math.h functions occurences with std:: Eshed 2016-10-15 12:05:57 +03:00
  • c43ab39670 Merge pull request #1033 from ashdnazg/fix_mingw Kim Kulling 2016-10-15 07:51:19 +02:00
  • 3b6ffc3ef5 fix mingw build (mingw supports stat64 nowadays) Eshed 2016-10-15 03:52:50 +03:00
  • 25cda401c5 use cmath and C++ (std::) versions of functions Eshed 2016-10-15 03:29:45 +03:00
  • 9c4bb1c9bc find the correct index in jointNames Angelo Scandaliato 2016-10-14 15:47:21 -07:00
  • 2505f02263 Added support for 64 bit version header introduced in FbxSdk2016 Rosario Leonardi 2016-10-14 17:47:10 +01:00
  • 1c03aebfb8 test combining skins Angelo Scandaliato 2016-10-13 19:49:59 -07:00
  • 084a6f6415 Obj-Streaming: add new io-stream for line-wise cached reading + first bugfixes. Kim Kulling 2016-10-12 15:30:04 +02:00
  • dc1e11c8be added some comments Angelo Scandaliato 2016-10-11 15:33:52 -07:00
  • 57a00d5faa find skeleton root joint and only allow four joint weights per vertex Angelo Scandaliato 2016-10-11 15:28:04 -07:00
  • ccf32aaf57 Merge pull request #1029 from samitc/master Kim Kulling 2016-10-11 13:48:24 +02:00
  • 905e48a35c Buffered stream API for big files: add next try of a prototype.^ Kim Kulling 2016-10-11 12:29:40 +02:00
  • 96a64a353a fix bug when reading strings in quote in MD5 models amit512 2016-10-11 13:04:41 +03:00
  • 6a0d4bac35 Merge pull request #1026 from ascandal/feature/gltf-skins-animation Kim Kulling 2016-10-10 22:20:10 +02:00
  • 6fa385549c Merge pull request #1027 from corporateshark/master Kim Kulling 2016-10-10 19:39:40 +02:00
  • 1c78f1be03 Fixed: unzip.h was still included even if the D3MF importer is disabled Sergey Kosarevsky 2016-10-10 17:58:06 +02:00
  • bf06ee3ed4 Merge branch 'master' into new_obj_stream_handling Kim Kulling 2016-10-10 10:19:45 +02:00
  • ad4d1f717f Obj-Import: finish first prototype of IOStreamBuffer. Kim Kulling 2016-10-10 10:18:14 +02:00
  • 47dd1eb227 Merge pull request #1025 from smalcom/issue_768 Kim Kulling 2016-10-09 18:09:19 +02:00
  • 1f377bc99d try to find root joint node for skeleton Angelo Scandaliato 2016-10-08 19:18:13 -07:00
  • b838070036 Update setup script. Kim Kulling 2016-10-09 01:32:31 +02:00
  • c49971e120 fix bug when exporting mRotationKeys data Angelo Scandaliato 2016-10-08 15:36:01 -07:00
  • 71de606770 add skeleton and mesh to node containing the mesh Angelo Scandaliato 2016-10-08 15:34:00 -07:00
  • 57b9232075 deleted code/MakeFile and added to .gitignore Angelo Scandaliato 2016-10-08 15:23:59 -07:00
  • 0359ded946 [F] Checking directive name with start from symbol 'm'. And checking argument of 'mtllib'. Alexandr Arutjunov 2016-10-07 16:40:51 +03:00