This commit is contained in:
Henrik Rydgård 2019-10-25 13:03:45 +02:00
parent 714f83f614
commit bbbd7f8acc
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@ -68,6 +68,7 @@ build.ios
versionname.txt
versioncode.txt
build*/
android/.cxx
# Temp file used by jenkins windows build (TODO: remove)
desc.txt

View File

@ -1332,7 +1332,7 @@ static inline Vec4<int> ModulateRGBA(const Vec4<int>& prim_color, const Vec4<int
} else {
out_rgb = prim_color.rgb() * texcolor.rgb() / 255;
}
out_a = (rgba) ? (prim_color.a() * texcolor.a() / 255) : prim_color.a();
out_a = (prim_color.a() * texcolor.a() / 255);
#endif
return Vec4<int>(out_rgb.r(), out_rgb.g(), out_rgb.b(), out_a);