diff --git a/.travis.yml b/.travis.yml index bdd7a549d..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 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. */