Kim Kulling
|
1126f8dade
|
Merge branch 'master' of https://github.com/assimp/assimp
|
2016-11-10 16:26:57 +01:00 |
|
Kim Kulling
|
1c5030c642
|
Remove some whitespaces.
|
2016-11-10 16:26:17 +01:00 |
Kim Kulling
|
b04069b441
|
Merge pull request #1062 from byteblob/patch-1
added void to aiGetErrorString's args
|
2016-11-10 13:47:19 +01:00 |
|
Kim Kulling
|
604b4e9723
|
Make travis build faster.
|
2016-11-10 10:33:07 +01:00 |
byteblob
|
c21c70ade6
|
added void to aiGetErrorString's args
|
2016-11-09 22:43:01 +01:00 |
|
Kim Kulling
|
888ea72f20
|
Merge pull request #1061 from assimp/optimized_faces_in_obj
ObjImporter: remove unnecessary allocations of std::vector
|
2016-11-09 20:52:22 +01:00 |
|
Kim Kulling
|
c07aee21b7
|
Fix build
|
2016-11-09 20:18:26 +01:00 |
|
Kim Kulling
|
568b459e24
|
Fix review findings.
|
2016-11-09 20:16:45 +01:00 |
|
Kim Kulling
|
ae956044aa
|
ObjImporter: remove unnecessary allocations of std::vector in obj-specific
face.
|
2016-11-09 20:09:45 +01:00 |
|
Kim Kulling
|
1d08c9e2e2
|
Merge pull request #1060 from assimp/issue_1059
Issue 1059
|
2016-11-08 21:31:47 +01:00 |
|
Kim Kulling
|
9f96126362
|
ObjParser: remove dead code.
|
2016-11-08 20:35:21 +01:00 |
|
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 |