Merge branch 'darkstalkers-work' into TemporaryHackishBranch

This commit is contained in:
LunaMoo committed 2019-10-25 22:37:20 +02:00
commit 2feaab9620
2 files changed
+2 -2

No files matched your search

+1 -1
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);