Kim Kulling [Mon, 12 Dec 2016 22:42:24 +0000 (23:42 +0100)]
Merge pull request #1109 from assimp/issue_899
closes assimp/assimp/issues/899: fix parsing of texture name.
Kim Kulling [Mon, 12 Dec 2016 20:34:55 +0000 (21:34 +0100)]
Build: fix typo in filename.
Kim Kulling [Mon, 12 Dec 2016 20:22:56 +0000 (21:22 +0100)]
Merge pull request #1106 from elect86/master
OBJ, added the index to handle clamp option for each cubemap texture
Kim Kulling [Mon, 12 Dec 2016 20:22:03 +0000 (21:22 +0100)]
closes assimp/assimp/issues/899: fix parsing of texture name.
Kim Kulling [Mon, 12 Dec 2016 09:59:13 +0000 (10:59 +0100)]
Merge pull request #1108 from elect86/patch-1
Update PlyParser.h
Giuseppe Barbieri [Sun, 11 Dec 2016 12:01:26 +0000 (13:01 +0100)]
Update PlyParser.h
Typo
Giuseppe Barbieri [Fri, 9 Dec 2016 18:31:07 +0000 (19:31 +0100)]
Update ObjFileImporter.cpp
Giuseppe Barbieri [Fri, 9 Dec 2016 18:27:01 +0000 (19:27 +0100)]
Update ObjFileImporter.h
Kim Kulling [Thu, 8 Dec 2016 19:07:56 +0000 (20:07 +0100)]
closes https://github.com/assimp/assimp/issues/1098: add license info.
Kim Kulling [Thu, 8 Dec 2016 18:42:21 +0000 (19:42 +0100)]
Merge pull request #1103 from assimp/dxf_testsuite
Initial test suite for DFX-format.
Kim Kulling [Thu, 8 Dec 2016 18:24:25 +0000 (19:24 +0100)]
Initial test suite for DFX-format.
Kim Kulling [Thu, 8 Dec 2016 16:49:36 +0000 (17:49 +0100)]
Merge pull request #1099 from asmaloney/warning_fixes
Fixes two type warnings and a missing case option
Kim Kulling [Thu, 8 Dec 2016 14:10:23 +0000 (15:10 +0100)]
Merge pull request #1100 from asmaloney/spelling_fixes
Fixes spelling in comments
Andy Maloney [Thu, 8 Dec 2016 02:31:51 +0000 (21:31 -0500)]
Fixes spelling in comments
Andy Maloney [Thu, 8 Dec 2016 01:30:45 +0000 (20:30 -0500)]
Fixes two type warnings and a missing case option
Kim Kulling [Wed, 7 Dec 2016 19:16:57 +0000 (20:16 +0100)]
Merge pull request #1087 from elect86/patch-4
Update ObjFileMtlImporter.cpp
Giuseppe Barbieri [Wed, 7 Dec 2016 18:52:03 +0000 (19:52 +0100)]
Update ObjFileMtlImporter.cpp
Kim Kulling [Mon, 5 Dec 2016 13:24:36 +0000 (14:24 +0100)]
Merge pull request #1094 from mrautio/fix-compilation
Fix MinGW compilation
Mika Rautio [Mon, 5 Dec 2016 11:01:16 +0000 (13:01 +0200)]
Fix MinGW compilation support
Mika Rautio [Mon, 5 Dec 2016 10:57:05 +0000 (12:57 +0200)]
Add better MinGW support for IFCReaderGen big objects
Mika Rautio [Mon, 5 Dec 2016 10:33:48 +0000 (12:33 +0200)]
MinGW __stat64 support depends on MSVCRT version
Mika Rautio [Mon, 5 Dec 2016 09:12:46 +0000 (11:12 +0200)]
Do not build exporter if its importer is not built
Kim Kulling [Sat, 3 Dec 2016 09:13:05 +0000 (10:13 +0100)]
Merge pull request #1092 from assimp/issue_1089
Readme: let readme stats looking more cleaner.
Kim Kulling [Sat, 3 Dec 2016 09:10:06 +0000 (10:10 +0100)]
Readme: let readme stats looking more cleaner.
Kim Kulling [Sat, 3 Dec 2016 08:23:07 +0000 (09:23 +0100)]
Remove compile warning.
Kim Kulling [Fri, 2 Dec 2016 15:59:19 +0000 (16:59 +0100)]
Merge pull request #1091 from assimp/issue_1089
FBX: woraround for issue 1089.
Kim Kulling [Fri, 2 Dec 2016 15:47:54 +0000 (16:47 +0100)]
Unittest: fix a uppcase typo for the example FBX-file.
Kim Kulling [Fri, 2 Dec 2016 13:31:18 +0000 (14:31 +0100)]
Merge branch 'master' into issue_1089
Kim Kulling [Fri, 2 Dec 2016 10:32:34 +0000 (11:32 +0100)]
FBX: woraround for issue 1089.
Kim Kulling [Thu, 1 Dec 2016 16:56:20 +0000 (17:56 +0100)]
Merge pull request #1085 from elect86/patch-3
Update ObjFileParser.cpp
Kim Kulling [Thu, 1 Dec 2016 09:53:07 +0000 (10:53 +0100)]
Merge pull request #1090 from assimp/new_unittests
New tests for importers.
Kim Kulling [Thu, 1 Dec 2016 09:29:39 +0000 (10:29 +0100)]
New tests for importers.
Kim Kulling [Wed, 30 Nov 2016 16:49:22 +0000 (17:49 +0100)]
Enable SIBImport test.
Kim Kulling [Wed, 30 Nov 2016 16:17:07 +0000 (17:17 +0100)]
Exporter: fix some review findings.
Kim Kulling [Wed, 30 Nov 2016 15:36:45 +0000 (16:36 +0100)]
Generate TestModelFactory for uniform test models in unittests.
Kim Kulling [Wed, 30 Nov 2016 14:05:06 +0000 (15:05 +0100)]
Enable unittest for apacity bug for dae files.
Kim Kulling [Wed, 30 Nov 2016 14:03:32 +0000 (15:03 +0100)]
BaseIMporter: fix review findings.
Kim Kulling [Wed, 30 Nov 2016 14:03:02 +0000 (15:03 +0100)]
AMFImporter: fix some review findings.
Kim Kulling [Tue, 29 Nov 2016 18:50:40 +0000 (19:50 +0100)]
AMFImporter: use correct unique token to identify schema for AMF-assets.
Kim Kulling [Tue, 29 Nov 2016 18:38:42 +0000 (19:38 +0100)]
Remove dead code.
Kim Kulling [Mon, 28 Nov 2016 09:40:10 +0000 (10:40 +0100)]
Fix appveyor build: disable bugger mingw config.
Giuseppe Barbieri [Sun, 27 Nov 2016 21:44:03 +0000 (22:44 +0100)]
Update ObjFileMtlImporter.cpp
Fixed grammar
Giuseppe Barbieri [Sun, 27 Nov 2016 19:32:59 +0000 (20:32 +0100)]
Update ObjFileParser.cpp
Fixed error message
Kim Kulling [Sun, 27 Nov 2016 16:35:22 +0000 (17:35 +0100)]
Enable win32-build: mingw.
Kim Kulling [Sun, 27 Nov 2016 15:44:03 +0000 (16:44 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sun, 27 Nov 2016 15:43:25 +0000 (16:43 +0100)]
ObjImporter: use pre increment as a micro optimization.
Kim Kulling [Sun, 27 Nov 2016 15:40:45 +0000 (16:40 +0100)]
Merge pull request #1083 from jaredmulconry/implementation_warning_fix
Fixed warnings on MSVC14 x64 (Issue #1065)
Kim Kulling [Sun, 27 Nov 2016 15:30:59 +0000 (16:30 +0100)]
Merge pull request #1080 from johnmaf/bugfix/collada-transparency
Properly export COLLADA <transparency> value
Jared Mulconry [Sun, 27 Nov 2016 06:34:34 +0000 (17:34 +1100)]
Added a preprocessor definition for MSVC to silence safety warnings regarding
C library functions. This addresses all warnings for MSVC x86 and x64 when
building zlib, tools and viewer as a static lib.
Jared Mulconry [Sun, 27 Nov 2016 05:03:25 +0000 (16:03 +1100)]
Fixed build warnings on MSVC14 x64 in the XGL loader.
Jared Mulconry [Sun, 27 Nov 2016 05:02:21 +0000 (16:02 +1100)]
Fixed build warnings on MSVC14 x64 in X file importer.
Jared Mulconry [Sun, 27 Nov 2016 04:54:22 +0000 (15:54 +1100)]
Fixed build warnings on MSVC14 x64 in the X3D format sources.
Jared Mulconry [Sun, 27 Nov 2016 04:16:19 +0000 (15:16 +1100)]
Fixed build warnings on MSVC14 x64 in the write dumb source.
Jared Mulconry [Sun, 27 Nov 2016 03:36:45 +0000 (14:36 +1100)]
Fixed build warnings on MSVC14 x64 in Unreal importer.
Jared Mulconry [Sun, 27 Nov 2016 03:35:49 +0000 (14:35 +1100)]
Fixed build warnings on MSVC14 x64 in Target Animation source.
Jared Mulconry [Sun, 27 Nov 2016 02:39:09 +0000 (13:39 +1100)]
Fixed build warnings on MSVC14 x64 in sweep context sources.
Jared Mulconry [Sun, 27 Nov 2016 02:37:32 +0000 (13:37 +1100)]
Fixed build warnings on MSVC14 x64 in subdivision routine.
Jared Mulconry [Sun, 27 Nov 2016 02:32:44 +0000 (13:32 +1100)]
Fixed build warnings on MSVC14 x64 in the STL format sources.
Jared Mulconry [Sun, 27 Nov 2016 02:28:40 +0000 (13:28 +1100)]
Fixed build warnings on MSVC14 x64 in spacial sort.
Jared Mulconry [Sun, 27 Nov 2016 02:17:02 +0000 (13:17 +1100)]
Fixed build warnings on MSVC14 x64 in the skeleton mesh builder.
Jared Mulconry [Sun, 27 Nov 2016 02:00:33 +0000 (13:00 +1100)]
Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix
# Conflicts:
# code/ObjFileImporter.cpp
Kim Kulling [Sat, 26 Nov 2016 14:21:26 +0000 (15:21 +0100)]
Merge pull request #1079 from johnmaf/bugfix/ns
Remove scaling of specular exponent in OBJFileImporter.cpp
John Senneker [Fri, 25 Nov 2016 17:09:49 +0000 (12:09 -0500)]
Properly export COLLADA <transparency> value
John Senneker [Fri, 25 Nov 2016 15:56:11 +0000 (10:56 -0500)]
Remove scaling of specular exponent in OBJFileImporter.cpp
Kim Kulling [Thu, 24 Nov 2016 20:34:56 +0000 (21:34 +0100)]
Merge pull request #1075 from Chainsawkitten/MinGW
Fix some MinGW warnings
Kim Kulling [Thu, 24 Nov 2016 20:15:07 +0000 (21:15 +0100)]
closes https://github.com/assimp/assimp/issues/1076: use ai_assert instead
of assert.
Albin Bernhardsson [Thu, 24 Nov 2016 14:15:17 +0000 (15:15 +0100)]
Put back unused line (in comments)
Albin Bernhardsson [Thu, 24 Nov 2016 13:53:33 +0000 (14:53 +0100)]
Remove unnecessary semicolon
Albin Bernhardsson [Thu, 24 Nov 2016 13:15:13 +0000 (14:15 +0100)]
Remove unused variable
Albin Bernhardsson [Thu, 24 Nov 2016 13:10:24 +0000 (14:10 +0100)]
Comment out unused variables
Albin Bernhardsson [Thu, 24 Nov 2016 12:26:18 +0000 (13:26 +0100)]
Remove unnecessary semicolons
Kim Kulling [Wed, 23 Nov 2016 21:00:52 +0000 (22:00 +0100)]
anim-header: fix some review findings + andd base tests.
Kim Kulling [Wed, 23 Nov 2016 19:20:45 +0000 (20:20 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Wed, 23 Nov 2016 19:20:11 +0000 (20:20 +0100)]
Fix some findings in animation header.
Jared Mulconry [Wed, 23 Nov 2016 11:24:04 +0000 (22:24 +1100)]
Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix
# Conflicts:
# code/AMFImporter_Postprocess.cpp
# code/FBXConverter.cpp
# code/IFCLoader.cpp
# code/NDOLoader.cpp
# code/glTFAsset.inl
Kim Kulling [Tue, 22 Nov 2016 21:03:31 +0000 (22:03 +0100)]
Fix coverity findings.
Kim Kulling [Tue, 22 Nov 2016 20:20:02 +0000 (21:20 +0100)]
Merge pull request #1074 from assimp/testsuite_aiMetadata
Ue new alloc semantic when using aiMetadata + increase test coverage.
Kim Kulling [Tue, 22 Nov 2016 20:17:47 +0000 (21:17 +0100)]
Fix build: use ai_assert instead of assert.
Kim Kulling [Tue, 22 Nov 2016 20:06:14 +0000 (21:06 +0100)]
Ue new alloc semantic when using aiMetadata + increase test coverage.
Kim Kulling [Tue, 22 Nov 2016 09:22:15 +0000 (10:22 +0100)]
Fix coverity findings.
Kim Kulling [Mon, 21 Nov 2016 22:55:14 +0000 (23:55 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Mon, 21 Nov 2016 22:54:39 +0000 (23:54 +0100)]
Add unittest fixure for aiMetadata.
Kim Kulling [Mon, 21 Nov 2016 19:57:15 +0000 (20:57 +0100)]
Appveyor: fix another merge error.
Kim Kulling [Mon, 21 Nov 2016 19:42:37 +0000 (20:42 +0100)]
Travis config: fix last merge issues + merge coverity check into master branch to avoid merge issues in the future on
Kim Kulling [Mon, 21 Nov 2016 19:31:35 +0000 (20:31 +0100)]
Disable android build.
Kim Kulling [Mon, 21 Nov 2016 19:21:26 +0000 (20:21 +0100)]
Fix another merge issue.
Kim Kulling [Mon, 21 Nov 2016 18:09:22 +0000 (19:09 +0100)]
Merge branch 'coverity_scan' of https://github.com/assimp/assimp into coverity_scan
Kim Kulling [Mon, 21 Nov 2016 17:57:56 +0000 (18:57 +0100)]
Merge branch 'master' into coverity_scan
Kim Kulling [Mon, 21 Nov 2016 17:55:57 +0000 (18:55 +0100)]
Fix coverity scan.
Kim Kulling [Mon, 21 Nov 2016 09:18:17 +0000 (10:18 +0100)]
Merge branch 'master' into coverity_scan
Kim Kulling [Sun, 20 Nov 2016 16:52:47 +0000 (17:52 +0100)]
Merge pull request #1071 from jaredmulconry/master
AMF Postprocessed Metadata given type bool regardless of original type
Kim Kulling [Sun, 20 Nov 2016 16:51:16 +0000 (17:51 +0100)]
Merge pull request #1073 from elect86/patch-2
Update STLLoader.cpp
Giuseppe Barbieri [Sun, 20 Nov 2016 14:14:33 +0000 (15:14 +0100)]
Update STLLoader.cpp
If `faceVertexCounter` does not start equal 3, then at line 291 you will get a warning
Jared Mulconry [Sun, 20 Nov 2016 03:08:38 +0000 (14:08 +1100)]
Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix
Jared Mulconry [Sun, 20 Nov 2016 03:07:24 +0000 (14:07 +1100)]
Fixed build warnings on MSVC14 x64 in the scene combiner.
Jared Mulconry [Sun, 20 Nov 2016 03:06:56 +0000 (14:06 +1100)]
Fixed build warnings on MSVC14 x64 in the SIB format sources.
Jared Mulconry [Sun, 20 Nov 2016 02:30:20 +0000 (13:30 +1100)]
Fixed build warnings on MSVC14 x64 in the Quake 3 format sources.
Jared Mulconry [Sun, 20 Nov 2016 02:18:11 +0000 (13:18 +1100)]
Fixed build warnings on MSVC14 x64 in some helpers.
Jared Mulconry [Sun, 20 Nov 2016 02:06:50 +0000 (13:06 +1100)]
Fixed build warnings on MSVC14 x64 in the pre-transform vertices post-process.
Jared Mulconry [Sun, 20 Nov 2016 02:04:56 +0000 (13:04 +1100)]
Fixed build warnings on MSVC14 x64 in some scene optimisations.
projects / platform / upstream / assimp.git / log