v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,936 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

3936 Commits (235010d531a967395b17fda83d2d88d176844f0f)

Author SHA1 Message Date
Kim Kulling 5ff1c39e02 Obj-Parser: Fix performance issue. 2016-11-08 20:34:55 +01:00
Kim Kulling 67febc41c6 QtViewer: some refactorings. 2016-11-08 14:53:52 +01:00
Kim Kulling 6d58926046 Code reformatting. 2016-11-08 10:38:57 +01:00
Kim Kulling 1aafe6287c Merge branch 'master' of https://github.com/assimp/assimp 2016-11-07 17:20:27 +01:00
Kim Kulling 8ffd94937e Fix BlenderDNA for clang cross compiler. 2016-11-07 17:19:49 +01:00
Kim Kulling a43634ebd0 Fix build: 2016-11-06 20:39:33 +01:00
Kim Kulling d4223d1fce closes https://github.com/assimp/assimp/issues/105://github.com/assimp/assimp/issues/1057 2016-11-06 19:36:37 +01:00
Kim Kulling cc7b7723c1 Merge branch 'master' of https://github.com/assimp/assimp 2016-11-05 18:41:52 +01:00
Kim Kulling 499886f89e ScenePreprocessor: fix invalid index counter. 2016-11-05 18:41:19 +01:00
Kim Kulling eaa494ed55 Merge pull request #1056 from AndrzejKozik/patch-1 
Keys interpolation fix
 2016-11-04 18:51:55 +01:00
AndrzejKozik dcb7478785 Update FBXConverter.cpp 2016-11-04 09:20:04 +01:00
AndrzejKozik a074ca58b3 Keys interpolation fix 
In line 3073 there was an unproper scope of cast to double.
 2016-11-04 08:48:14 +01:00
Kim Kulling dfaea27dfc MaterialSystem: fix some findings. 2016-11-03 23:29:03 +01:00
Kim Kulling c849e0108d Merge pull request #1055 from assimp/issue_957 
Fix compiler warnings related to issue 957.
 2016-11-03 19:11:56 +01:00
Kim Kulling 02e038bbb6 Fix compiler warnings related to issue 957. 2016-11-03 18:37:02 +01:00
Kim Kulling 6c7accfb3d Merge pull request #1054 from mgerhardy/patch-2 
Fixes compile issue for 3ds exporter
 2016-11-03 12:35:56 +01:00
Kim Kulling 413116a73b Merge pull request #1053 from rdb/patch-2 
Fix compile error with MSVC 2015
 2016-11-02 20:12:59 +01:00
Martin Gerhardy b30dc8ffc9 Fixes compile issue for 3ds exporter 
... when you have disabled the 3ds importer
 2016-11-02 19:54:53 +01:00
rdb b5c7c9c3ac Fix compile error with MSVC 2015 
This patch fixes compilation with MSVC 2015.  WIN32 is not a preprocessor symbol that is defined by MSVC, but _WIN32 is.
 2016-11-02 18:42:16 +01:00
Kim Kulling 3e05d13827 Merge pull request #1048 from tomacd/keep_materials_names 
Keep original materials names in RemoveRedundantMaterials, ColladaExporter
 2016-10-31 09:42:45 +01:00
Kim Kulling fcac614ad0 Blender: fix compiler warning: FAIL already defined. 2016-10-30 19:21:38 +01:00
Kim Kulling 8b2f1085c7 Merge pull request #1043 from assimp/new_obj_stream_handling 
New obj stream handling
 2016-10-30 12:30:52 +01:00
Kim Kulling 337990510c Fix rounding issue in unittest for block calculation. 2016-10-30 11:16:31 +01:00
Kim Kulling 810fc405a8 Fix build. 2016-10-30 09:06:45 +01:00
Kim Kulling 293654fe7c Fix unittest. 2016-10-30 08:55:11 +01:00
Kim Kulling b9261f01a3 Obj-Stream-Handling: fix compiler-errors and warnings. 2016-10-29 21:41:24 +02:00
Kim Kulling 186f3f091f Merge branch 'new_obj_stream_handling' of https://github.com/assimp/assimp into new_obj_stream_handling 2016-10-29 20:07:53 +02:00
Kim Kulling 8bae6ad7b7 Add missing license info. 2016-10-29 19:11:00 +02:00
Kim Kulling b13c30f50e Obj: Fix some small issues 2016-10-29 19:07:30 +02:00
tomacd 8e8757f800 Keep original materials names after RemoveRedundant materials process and export to collada 2016-10-27 19:23:43 +02:00
Kim Kulling 949a27a743 New streaming interface: fix build. 2016-10-22 23:34:56 +02:00
Kim Kulling 54c5acd02d Merge branch 'master' of https://github.com/assimp/assimp 2016-10-22 22:15:00 +02:00
Kim Kulling 79504c08d9 QtViewer: fix review findings. 2016-10-22 22:14:01 +02:00
Kim Kulling cbe2e9af49 Merge branch 'master' into new_obj_stream_handling 2016-10-22 21:04:02 +02:00
Kim Kulling d3a3bd9c12 BUgfixes regarding filepos setupBUgfixes regarding filepos setup. 2016-10-22 21:03:11 +02:00
Kim Kulling 33e370a8b7 Obj-Stream-Handling: fix readin of linewise import. 2016-10-21 21:14:35 +02:00
Kim Kulling 1724cc9e66 Remove redundant file. 2016-10-21 19:44:31 +02:00
Kim Kulling 50803b897c Merge branch 'master' of https://github.com/assimp/assimp 2016-10-21 19:43:56 +02:00
Kim Kulling 3b61ff4cf2 Qt5-based Viewer: fix build. 2016-10-21 12:50:41 +02:00
Kim Kulling fe0cfc52bc Q3BSP-Loader: reformat include. 2016-10-20 22:25:39 +02:00
Kim Kulling af54cb8a29 Q3BSP: fix license dates. 2016-10-20 17:04:37 +02:00
Kim Kulling 6a31e3528e Merge branch 'master' of https://github.com/assimp/assimp 2016-10-20 16:43:38 +02:00
Kim Kulling 91e833056e Q3BSP-Importer: remove commented code. 2016-10-20 16:42:00 +02:00
Kim Kulling b0f09ee6e2 Merge pull request #903 from dontbmh/upstream 
fix strncpy not null terminated string
 2016-10-20 16:18:30 +02:00
Kim Kulling 74ab4afd01 Merge pull request #1042 from VeganPower/Fix_988 
Added support for 64 bit version header introduced in FbxSdk2016
 2016-10-19 16:03:53 +02:00
Kim Kulling bac28061ea 3MF: fix nullptr access. 2016-10-18 21:16:44 +02:00
Kim Kulling 8fd030f23d Merge pull request #1040 from johnmaf/bugfix/obj-mtllib-parse 
Fix OBJ parser mtllib statement parsing bug.
 2016-10-18 17:09:06 +02:00
John Senneker acd2802f22 Check for std::string::npos before applying std::string::substr 2016-10-18 10:48:47 -04:00
Kim Kulling a54e42cb5a Some more fixes. 2016-10-18 14:02:58 +02:00
John Senneker 4b15dfd9af Fix OBJ parser mtllib statement parsing bug. 
Since `getName` returns the whole line (including spaces) parse out the
first word for comparison.
 2016-10-17 18:48:04 -04:00