projects
/
platform
/
upstream
/
assimp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d18f978
)
ColladaLoader: add missing .f
author
Kim Kulling
<kim.kulling@googlemail.com>
Sat, 9 Jan 2016 17:09:52 +0000
(18:09 +0100)
committer
Kim Kulling
<kim.kulling@googlemail.com>
Sat, 9 Jan 2016 17:09:52 +0000
(18:09 +0100)
code/ColladaLoader.cpp
patch
|
blob
|
history
diff --git
a/code/ColladaLoader.cpp
b/code/ColladaLoader.cpp
index
b24a6b4
..
03436d4
100644
(file)
--- a/
code/ColladaLoader.cpp
+++ b/
code/ColladaLoader.cpp
@@
-1365,7
+1365,7
@@
void ColladaLoader::FillMaterials( const ColladaParser& pParser, aiScene* /*pSce
effect.mTransparency *= (
0.212671f * effect.mTransparent.r +
0.715160f * effect.mTransparent.g +
- 0.072169 * effect.mTransparent.b
+ 0.072169
f
* effect.mTransparent.b
);
effect.mTransparent.a = 1.f;