fdd01bda83
BatchImporter: make validation configurable and add unittest for class.
2016-11-12 02:04:05 +00:00
631eef49c3
BatchImporter: make validation configurable and add unittest for class.
2016-11-11 12:49:05 +01:00
cf7059f074
Fix obj .mtl file loading
...
Fix the obj file loader by adding a new method which allows
a name to be read considering the space in the middle between two
words and use that for parsing the "mtlib" line in the .obj file
parsing method.
Before, the method used in the obj parsing function would have
returned the string "mtlib NAME_OF_MTL" instead of "mtlib" only,
which resulted in the .mtl file being never parsed.
2016-11-10 23:12:36 +00:00
7a578aae46
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-10 21:40:05 +01:00
c5d6ac2c30
ObjParser: remove deprecated code.
2016-11-10 21:39:32 +01:00
1126f8dade
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-10 16:26:57 +01:00
1c5030c642
Remove some whitespaces.
2016-11-10 16:26:17 +01:00
b04069b441
Merge pull request #1062 from byteblob/patch-1
...
added void to aiGetErrorString's args
2016-11-10 13:47:19 +01:00
604b4e9723
Make travis build faster.
2016-11-10 10:33:07 +01:00
c21c70ade6
added void to aiGetErrorString's args
2016-11-09 22:43:01 +01:00
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
c07aee21b7
Fix build
2016-11-09 20:18:26 +01:00
568b459e24
Fix review findings.
2016-11-09 20:16:45 +01:00
ae956044aa
ObjImporter: remove unnecessary allocations of std::vector in obj-specific
...
face.
2016-11-09 20:09:45 +01:00
1d08c9e2e2
Merge pull request #1060 from assimp/issue_1059
...
Issue 1059
2016-11-08 21:31:47 +01:00
9f96126362
ObjParser: remove dead code.
2016-11-08 20:35:21 +01:00
5ff1c39e02
Obj-Parser: Fix performance issue.
2016-11-08 20:34:55 +01:00
67febc41c6
QtViewer: some refactorings.
2016-11-08 14:53:52 +01:00
6d58926046
Code reformatting.
2016-11-08 10:38:57 +01:00
1aafe6287c
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-07 17:20:27 +01:00
8ffd94937e
Fix BlenderDNA for clang cross compiler.
2016-11-07 17:19:49 +01:00
a43634ebd0
Fix build:
2016-11-06 20:39:33 +01:00
d4223d1fce
closes https://github.com/assimp/assimp/issues/105://github.com/assimp/assimp/issues/1057
2016-11-06 19:36:37 +01:00
cc7b7723c1
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-05 18:41:52 +01:00
499886f89e
ScenePreprocessor: fix invalid index counter.
2016-11-05 18:41:19 +01:00
eaa494ed55
Merge pull request #1056 from AndrzejKozik/patch-1
...
Keys interpolation fix
2016-11-04 18:51:55 +01:00
dcb7478785
Update FBXConverter.cpp
2016-11-04 09:20:04 +01:00
a074ca58b3
Keys interpolation fix
...
In line 3073 there was an unproper scope of cast to double.
2016-11-04 08:48:14 +01:00
dfaea27dfc
MaterialSystem: fix some findings.
2016-11-03 23:29:03 +01:00
c849e0108d
Merge pull request #1055 from assimp/issue_957
...
Fix compiler warnings related to issue 957.
2016-11-03 19:11:56 +01:00
02e038bbb6
Fix compiler warnings related to issue 957.
2016-11-03 18:37:02 +01:00
6c7accfb3d
Merge pull request #1054 from mgerhardy/patch-2
...
Fixes compile issue for 3ds exporter
2016-11-03 12:35:56 +01:00
413116a73b
Merge pull request #1053 from rdb/patch-2
...
Fix compile error with MSVC 2015
2016-11-02 20:12:59 +01:00
b30dc8ffc9
Fixes compile issue for 3ds exporter
...
... when you have disabled the 3ds importer
2016-11-02 19:54:53 +01:00
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
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
fcac614ad0
Blender: fix compiler warning: FAIL already defined.
2016-10-30 19:21:38 +01:00
8b2f1085c7
Merge pull request #1043 from assimp/new_obj_stream_handling
...
New obj stream handling
2016-10-30 12:30:52 +01:00
337990510c
Fix rounding issue in unittest for block calculation.
2016-10-30 11:16:31 +01:00
810fc405a8
Fix build.
2016-10-30 09:06:45 +01:00
293654fe7c
Fix unittest.
2016-10-30 08:55:11 +01:00
b9261f01a3
Obj-Stream-Handling: fix compiler-errors and warnings.
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
2016-10-29 20:07:53 +02:00
8bae6ad7b7
Add missing license info.
2016-10-29 19:11:00 +02:00
b13c30f50e
Obj: Fix some small issues
2016-10-29 19:07:30 +02:00
8e8757f800
Keep original materials names after RemoveRedundant materials process and export to collada
2016-10-27 19:23:43 +02:00
949a27a743
New streaming interface: fix build.
2016-10-22 23:34:56 +02:00
54c5acd02d
Merge branch 'master' of https://github.com/assimp/assimp
2016-10-22 22:15:00 +02:00
79504c08d9
QtViewer: fix review findings.
2016-10-22 22:14:01 +02:00
cbe2e9af49
Merge branch 'master' into new_obj_stream_handling
2016-10-22 21:04:02 +02:00
Kim Kulling
Alberto Taiuti
Kim Kulling
byteblob
AndrzejKozik
Martin Gerhardy
rdb
tomacd