c5d7a97b93
Travis config: fix last merge issues + merge coverity check into master branch to avoid merge issues in the future on master.
2016-11-21 20:42:37 +01:00
68b8948758
Disable android build.
2016-11-21 20:31:35 +01:00
eb462abf60
Fix another merge issue.
2016-11-21 20:21:26 +01:00
4880cd4a8c
Merge branch 'coverity_scan' of https://github.com/assimp/assimp into coverity_scan
2016-11-21 19:09:22 +01:00
e50ac81b65
Merge branch 'master' into coverity_scan
2016-11-21 18:57:56 +01:00
8a9deeb4a0
Fix coverity scan.
2016-11-21 18:55:57 +01:00
9e07701f3e
Merge branch 'master' into coverity_scan
2016-11-21 10:18:17 +01:00
eb6390a639
Merge pull request #1071 from jaredmulconry/master
...
AMF Postprocessed Metadata given type bool regardless of original type
2016-11-20 17:52:47 +01:00
86dd83cced
Merge pull request #1073 from elect86/patch-2
...
Update STLLoader.cpp
2016-11-20 17:51:16 +01:00
b6fb1f3c05
Update STLLoader.cpp
...
If `faceVertexCounter` does not start equal 3, then at line 291 you will get a warning
2016-11-20 15:14:33 +01:00
7ceaca61fd
Set right source encoding for coveralls-lcov.
2016-11-19 15:23:08 +01:00
d0d07006c8
Travis config: fix typo.
2016-11-19 11:54:39 +01:00
dc3875b8f2
Travis: fix typo.
2016-11-19 11:48:39 +01:00
e4d43aa51a
Fixed a bug in the AMF Importer Postprocessing where metadata would be
...
incorrectly recorded as having type bool for all entries.
2016-11-19 02:07:32 +11:00
235010d531
Merge pull request #1070 from elect86/patch-1
...
Update material.h
2016-11-18 14:56:22 +01:00
91e4d029dc
Update material.h
...
Fixed grammar
2016-11-18 13:08:00 +01:00
cae8a172c3
Merge branch 'master' into coverity_scan
2016-11-18 11:38:45 +01:00
a9c5b6f1be
Ensure that filelist for assimp lib is not empty for coveralls.
2016-11-17 19:57:24 +01:00
46a022520f
Remove commented code.
2016-11-17 19:11:28 +01:00
0f2ed2c449
Remove unused filter for coveralls.
2016-11-17 15:11:05 +01:00
01135855e0
Remove folder test from test coverage.
2016-11-17 14:35:21 +01:00
b990e93b9f
Merge pull request #1067 from assimp/coverall_support
...
Travis: enable coverall support.
2016-11-17 11:40:35 +01:00
9b63015626
Disable debou output for lcov call in travis config.
2016-11-17 11:17:53 +01:00
7a7f7b851b
Remove deprecated boost workaround flag from travis config.
2016-11-17 11:16:42 +01:00
2fdc6a51d2
Embed coverage to readme.
2016-11-17 10:57:53 +01:00
6daa464378
Next try: use original directory root.
2016-11-17 10:23:57 +01:00
8b1f382a0e
Travis config: use correct env variable to enable coveralls.
2016-11-17 10:06:50 +01:00
8bd9fadeea
Check assimp.dir folder.
2016-11-16 21:43:22 +01:00
c695c74a60
Much more verbose.
2016-11-16 21:35:10 +01:00
8d4633510f
More verbose.
2016-11-16 21:28:20 +01:00
1dd8148e81
Make travis more verbose.
2016-11-16 21:16:50 +01:00
4d47e47815
Fix typo.
2016-11-16 20:14:54 +01:00
c399981dbe
Next try.
2016-11-16 20:08:04 +01:00
7307c07623
Add missing cmake mocules
2016-11-16 16:46:54 +01:00
284b755cf9
add test source to coveralls again.
2016-11-16 16:36:22 +01:00
4ac3a0af8f
iEnable coverall for tests.
2016-11-16 16:19:43 +01:00
6c5e475d14
Still working on config.
2016-11-16 16:11:30 +01:00
09df4b0299
Fix travis cmake call to enable coberalls.
2016-11-16 15:54:53 +01:00
e95ccee97e
Test coverage only in one comp from build matrix.
2016-11-16 15:42:08 +01:00
53d6adeb53
Enable coveralls measurement
2016-11-16 12:24:55 +01:00
76794f4aa7
Enableing test coverage for unittests.
2016-11-16 12:06:21 +01:00
a6c86c79f1
Travis: enable coverall support.
2016-11-16 11:39:44 +01:00
a1f773c305
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-14 20:34:52 +01:00
855031d37c
CmakeLists: remove ugly and deprecated hack fo mingw.
2016-11-14 20:20:03 +01:00
302b8044c6
Merge pull request #1064 from snowzurfer/master
...
Fix obj .mtl file loading
2016-11-14 20:17:28 +01:00
afad31acab
Merge pull request #1066 from jaredmulconry/master
...
MSVC14 x64 /bigobj missing causes compile error
2016-11-14 19:02:52 +01:00
eceb61b854
Fixed a compile error on MSVC14 x64 caused by the /bigobj flag failing to be set
...
for the 1 and 2-suffixed versions introduced in
commit 0a25b076b8
2016-11-14 22:52:29 +11:00
ce4f696312
Revert "Make assimp build cherry-picked importers in CMake"
...
This reverts commit 70d5bb8c7b
2016-11-12 02:10:51 +00:00
70d5bb8c7b
Make assimp build cherry-picked importers in CMake
...
Modify assimp's cmake to exclude the build of all the importers
by default; the user has then to manually select the ones needed
by setting the relative option.
From the explanation as written in the CMakeLists itself:
---
This option allows to select whether to build all the importers and then
manually select which ones not to build (old behaviour), or if to
exclude all importers from build and manually select the ones to actually
build.
By default, exclude all importers and manually select which ones to use.
To have all importers excluded, simply do not set this option in the parent
CmakeLists. Then, set the option for the importer(s) needed in the parent
CMakeLists, e.g.:
OPTION(ASSIMP_BUILD_OBJ_IMPORTER "" TRUE)
To have assimp build all the importers, set the option to true, then manually
exclude which importers you don't need, e.g.:
OPTION(ASSIMP_BUILD_OBJ_IMPORTER "" FALSE)
NOTE: In order to use this method of exclusion, the tools build must be disabled;
their code references certain importers/exporters which would be excluded.
If you need the tools, either manually add the importers/exporters the code
references (you will see linkage errors), or just enable the build of all the
importers as explained above.
---
As mentioned there, set the main CMakeLists not to build the tools and
the tests by default, since they use certain exporters and importers
which, with this method, are not necessarily used/built.
2016-11-12 02:04:05 +00:00
fdd01bda83
BatchImporter: make validation configurable and add unittest for class.
2016-11-12 02:04:05 +00:00
Kim Kulling
Kim Kulling
Giuseppe Barbieri
Jared Mulconry
Alberto Taiuti