Kim Kulling
0c1b5355f4
Coverity finding: remove not used function.
2015-12-30 15:35:26 +01:00
Kim Kulling
8d07e34336
travis config: remove coverity config from master branch.
2015-12-29 20:46:41 +01:00
Kim Kulling
da21306f85
travis config: still fighting with tabs.
2015-12-29 20:17:20 +01:00
Kim Kulling
288b81ff7b
travis config: fix more invalid tabs and one typo.
2015-12-29 20:09:26 +01:00
Kim Kulling
0cc5e50443
travis config: remove erroreous tab intention.
2015-12-29 20:06:33 +01:00
Stepan Hrbek
ad55e769bf
Collada exporter: bind uv channels with <bind_vertex_input>.
...
When there are multiple uv channels used by multiple textures, <bind_vertex_input> specifies what channels to use. Without <bind_vertex_input>, at least some importers are unable to match channels to textures.
2015-12-29 17:08:16 +01:00
Kim Kulling
5ff3e0dd15
coverity: enable automatic coverity scan.
2015-12-29 16:19:42 +01:00
Kim Kulling
43be58bbfe
rapidjson: add apple-specific constructor with size_t.
2015-12-28 13:02:04 +01:00
Kim Kulling
22f7f60ba0
glTF: usage of (hopefully) correct data type for size types: closes https://github.com/assimp/assimp/issues/723
2015-12-27 20:36:54 +01:00
Kim Kulling
9409ce3b56
https://github.com/assimp/assimp/issues/714 : fix null pointer access with
...
unknown texture.
2015-12-27 00:19:11 +01:00
Kim Kulling
a148f1e28c
Fix typo.
2015-12-27 00:15:14 +01:00
Kim Kulling
04832218a1
https://github.com/assimp/assimp/issues/728 : XCode fix.
2015-12-27 00:07:37 +01:00
Kim Kulling
9af4747fa8
github.com/assimp/assimp/issues/730: use correct define check
2015-12-26 21:02:32 +01:00
Kim Kulling
59c856fcf3
Travis: disable regression test suite.
2015-12-20 20:23:16 +01:00
Alexander Gessler
5847576f41
Merge pull request #703 from terziman/master
...
Improvement of collada transparency handling
2015-12-20 15:59:42 +01:00
Alexander Gessler
7e85f45abc
Merge pull request #713 from ov/normalize-safe
...
GenVertexNormalsProcess produces invalid results for specific input
2015-12-20 00:06:58 +01:00
Alexander Gessler
891411514b
Merge pull request #721 from luho383/fbx_file_import
...
Fix for FBX Files that do not have a Comma on a new line in a data block
2015-12-20 00:06:02 +01:00
Alexander Gessler
3b10f69f7e
Merge pull request #719 from luho383/master
...
FBX Import fix
2015-12-20 00:04:45 +01:00
Alexander Gessler
b929b04715
Merge pull request #726 from dankex/localref
...
Use SmartLocalRef to automatically release localrefs in jassimp.cpp
2015-12-20 00:03:42 +01:00
Danke Xie
b0148641e9
Make SmartLocalRef non-copyable
2015-12-19 09:13:28 -08:00
Danke Xie
2e831604e9
Use SmartLocalRef to automatically release localrefs in jassimp.cpp
...
- Add SmartLocalRef class
- Use it to automatically delete localrefs of Java objects, generated
by FindClass, createInstance, getField, NewStringUTF, etc.
- Tested with models with more than 512 nodes.
2015-12-19 01:30:02 -08:00
Kim Kulling
8a037124a8
Merge pull request #725 from coderextreme/master
...
Added GenericValue(unsigned long) to document.h
2015-12-18 13:16:02 +01:00
carlsonsolutiondesign
dd89bd3703
Only test for __APPLE__ here to avoid conflicts with Linux (and maybe Windows)
2015-12-17 17:02:06 -05:00
carlsonsolutiondesign
fa0427ca28
Copies the GenericValue(uint64_t) to a GenericValue(unsigned long) for compilation on Mac OS X 10.11.2. Not compiled on Windows yet. Will have to reboot and install Visual Studio or equivalent to compile, so I'm hoping someone else can look at the code and merge for Windows and Linux. Thanks!
2015-12-17 12:16:25 -05:00
John Carlson
0ebab2ef23
Merge pull request #1 from assimp/master
...
Pull from master 12-17-2015
2015-12-17 09:53:56 -05:00
lutz.hoeren
90ddb93940
Fix for FBX Files that do not have a Comma on a new line in a data block
2015-12-17 11:48:44 +01:00
lutz.hoeren
7e02b34090
Merge branch 'master' of https://github.com/luho383/assimp
2015-12-16 15:26:10 +01:00
lutz.hoeren
e8a02ef890
Only read Element Data when there is a valid Mapping Information
2015-12-16 15:25:33 +01:00
Kim Kulling
f75b919d42
Merge branch 'ov-issue-707'
2015-12-14 18:49:46 +01:00
Kim Kulling
3d6e1483d8
Update readme.
2015-12-14 18:42:31 +01:00
Kim Kulling
6b297b8960
New obj regression data.
2015-12-14 18:39:32 +01:00
Kim Kulling
6dfc99aa3d
New db.zip.
2015-12-14 18:38:01 +01:00
Kim Kulling
e0015b8610
Regression: updated test db.
2015-12-14 18:12:14 +01:00
Kim Kulling
87b3af4c3b
Merge branch 'issue-707' of https://github.com/ov/assimp into ov-issue-707
2015-12-14 17:46:54 +01:00
Kim Kulling
b60f57ece7
Merge pull request #716 from rmitton/empty_objmtl
...
Added support for empty .MTL files.
2015-12-14 09:29:31 +01:00
Kim Kulling
40272b4d26
Merge pull request #715 from rmitton/doc_fixes
...
Tiny misc fixes for documentation
2015-12-14 09:12:17 +01:00
Kim Kulling
db96007f77
Merge pull request #717 from rmitton/sib_import
...
Importer for Nevercenter Silo SIB files.
2015-12-14 09:09:52 +01:00
rmitton
d952823ffd
Importer for Silo SIB files.
...
Wrote an importer for Nevercenter Silo's binary SIB model format
2015-12-13 22:14:19 -08:00
rmitton
b9a4e99607
Added support for empty .MTL files.
...
Some programs such as Silo export an empty .MTL file if you export a
.OBJ that doesn't use any materials. This patch allows the loading of
such files.
2015-12-13 22:13:25 -08:00
rmitton
957426ed72
Tiny misc fixes for documentation
2015-12-13 22:12:25 -08:00
Vitaly Ovchinnikov
6e2b0b4fd1
a speedup
2015-12-14 15:37:27 +13:00
Vitaly Ovchinnikov
b6f14eb917
Normalize() is replaced with NormalizeSafe() to prevent invalid vectors generation
2015-12-14 15:31:49 +13:00
Vitaly Ovchinnikov
af40c99a6a
trimming spaces around material names
2015-12-14 08:32:09 +13:00
Vitaly Ovchinnikov
c9ef6132a8
a small fix
2015-12-13 23:10:31 +13:00
Vitaly Ovchinnikov
6214fbfbbe
this patch fixes multiple objects generation in OBJ reader if faces are prepended with 'usemtl' line
2015-12-13 22:54:50 +13:00
Kim Kulling
078dd0c08b
Merge pull request #705 from Vertexwahn/master
...
Added custom target that copies generated libs and bin files to lib32/lib64 and bin32/64 folder
2015-12-11 14:09:59 +01:00
Vertexwahn
270355f326
Improved Findassimp.cmake to support VS2013. Added deployment of VS2013 libs and dll files.
2015-12-11 10:33:47 +01:00
Alexander Gessler
5fc66d6c43
Merge pull request #706 from expipiplus1/spelling
...
Correct spelling
2015-12-10 21:49:24 +01:00
Vertexwahn
1fd66df37d
Improved Findassimp.cmake to support VS2015.
2015-12-10 17:58:55 +01:00
Joe Hermaszewski
210764a6ff
Correct spelling
2015-12-10 16:19:33 +00:00