mewin/glm
1
0
Fork 0
Code Releases Activity

Merged 0.9.8 branch

Browse Source
This commit is contained in:
Christophe Riccio
2017-01-07 12:15:08 +01:00
parent 9134d7904a 4e267b1b4f
commit 39f775fa6c
18 changed files with 183 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glm/gtc/color_space.inl
View File

@@ -23,7 +23,7 @@ namespace detail
{
GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const& ColorRGB, T GammaCorrection)
{
return vec<4, T, P>(compute_rgbToSrgb<3, T, P, vec>::call(vec<3, T, P>(ColorRGB), GammaCorrection), ColorRGB.a);
return vec<4, T, P>(compute_rgbToSrgb<3, T, P, vec>::call(vec<3, T, P>(ColorRGB), GammaCorrection), ColorRGB.w);
}
};
@@ -44,7 +44,7 @@ namespace detail
{
GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const& ColorSRGB, T Gamma)
{
return vec<4, T, P>(compute_srgbToRgb<3, T, P, vec>::call(vec<3, T, P>(ColorSRGB), Gamma), ColorSRGB.a);
return vec<4, T, P>(compute_srgbToRgb<3, T, P, vec>::call(vec<3, T, P>(ColorSRGB), Gamma), ColorSRGB.w);
}
};
}//namespace detail