v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix

pull/1083/head
Jared Mulconry 2016-11-20 14:08:38 +11:00
parent ff31abf57c 7ceaca61fd
commit 7d64e4155b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -50,5 +50,5 @@ after_success:
- lcov --directory . --capture --output-file coverage.info - lcov --directory . --capture --output-file coverage.info
- lcov --remove coverage.info '/usr/*' 'contrib/*' 'test/*' --output-file coverage.info - lcov --remove coverage.info '/usr/*' 'contrib/*' 'test/*' --output-file coverage.info
- lcov --list 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

2
include/assimp/material.h
View File

@ -413,7 +413,7 @@ enum aiTextureFlags
* SourceColor * SourceBlend + DestColor * DestBlend * SourceColor * SourceBlend + DestColor * DestBlend
* @endcode * @endcode
* where DestColor is the previous color in the framebuffer at this * 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.<br> * calculation.<br>
* This corresponds to the #AI_MATKEY_BLEND_FUNC property. * This corresponds to the #AI_MATKEY_BLEND_FUNC property.
*/ */