diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-10 17:53:11 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-10 17:53:11 -0400 |
commit | 6732f5fbca2dc83ec1cf6fcb31b5a6657e8d040f (patch) | |
tree | 48165a2aa3aed2133d1d79742e3d64cce3ca2b01 /indra/newview/app_settings/shaders/class1/objects/shinySimpleSkinnedV.glsl | |
parent | 20c3d8485480487d38500c9b18846ca96d1d6f83 (diff) | |
parent | c7b6a25728cd360348d1c3da5ace0971767206a4 (diff) |
merge viewer-development to mesh-development
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/objects/shinySimpleSkinnedV.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/objects/shinySimpleSkinnedV.glsl | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/objects/shinySimpleSkinnedV.glsl b/indra/newview/app_settings/shaders/class1/objects/shinySimpleSkinnedV.glsl index cd655f3bb5..eea41bb4f0 100644 --- a/indra/newview/app_settings/shaders/class1/objects/shinySimpleSkinnedV.glsl +++ b/indra/newview/app_settings/shaders/class1/objects/shinySimpleSkinnedV.glsl @@ -11,8 +11,6 @@ vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol); void calcAtmospherics(vec3 inPositionEye); mat4 getObjectSkinnedTransform(); -attribute vec4 object_weight; - void main() { mat4 mat = getObjectSkinnedTransform(); |