diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-10-17 15:20:34 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-10-17 15:20:34 -0700 |
| commit | be01ac2a365662360c6f64ac6cb8b4ea083291cb (patch) | |
| tree | 58400e2e8f100af921805c39b23d33733d216113 /indra/newview/app_settings/shaders/class1 | |
| parent | f6c7b906e1f1d1bcc56a1e71b1867a58c5b2381a (diff) | |
BUG-4185 : Fix glsl compilation error on Mac
Diffstat (limited to 'indra/newview/app_settings/shaders/class1')
| -rwxr-xr-x | indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl index 3df4d333ce..9a8dbeab58 100755 --- a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl @@ -34,8 +34,8 @@ mat4 getSkinnedTransform() float x = fract(weight.x); int i = int(floor(weight.x)); - i = min(i, 15); - i = max(i, 0); + i = int(min(i, 15)); + i = int(max(i, 0)); ret[0] = mix(matrixPalette[i+0], matrixPalette[i+1], x); ret[1] = mix(matrixPalette[i+15],matrixPalette[i+16], x); ret[2] = mix(matrixPalette[i+30],matrixPalette[i+31], x); |