From 91e4d029dc72cf76b9e4bc562f7554ce9bf21d11 Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Fri, 18 Nov 2016 13:08:00 +0100 Subject: [PATCH 1/3] Update material.h Fixed grammar --- include/assimp/material.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/assimp/material.h b/include/assimp/material.h index 1f97096b2..23a45878e 100644 --- a/include/assimp/material.h +++ b/include/assimp/material.h @@ -413,7 +413,7 @@ enum aiTextureFlags * SourceColor * SourceBlend + DestColor * DestBlend * @endcode * where DestColor is the previous color in the framebuffer at this - * position and SourceColor is the material colro before the transparency + * position and SourceColor is the material color before the transparency * calculation.
* This corresponds to the #AI_MATKEY_BLEND_FUNC property. */ From d0d07006c8e325012875a4c30d388c1a6c97b3ef Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sat, 19 Nov 2016 11:54:39 +0100 Subject: [PATCH 2/3] Travis config: fix typo. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bdd7a549d..9e553f489 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,5 +50,5 @@ after_success: - lcov --directory . --capture --output-file coverage.info - lcov --remove coverage.info '/usr/*' 'contrib/*' 'test/*' --output-file coverage.info - lcov --list coverage.info - - coveralls-lcov --repo-token ${COVERALLS_TOKEN} coverage.info + - coveralls-lcov --repo-token=${COVERALLS_TOKEN} coverage.info From 7ceaca61fd64ccb85423161c09cf8558ad3645f3 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sat, 19 Nov 2016 15:23:08 +0100 Subject: [PATCH 3/3] Set right source encoding for coveralls-lcov. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9e553f489..ff9318bb4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,5 +50,5 @@ after_success: - lcov --directory . --capture --output-file coverage.info - lcov --remove coverage.info '/usr/*' 'contrib/*' 'test/*' --output-file coverage.info - lcov --list coverage.info - - coveralls-lcov --repo-token=${COVERALLS_TOKEN} coverage.info + - coveralls-lcov --source-encoding=ISO-8859-1 --repo-token=${COVERALLS_TOKEN} coverage.info