Merged changes between 1.4.0-beta3 and 1.4.0-beta4 into dev-1_5

1 files changed, 0 insertions, 19 deletions

diff --git a/src/GLSLShaderTest/toon.vert b/src/GLSLShaderTest/toon.vert
deleted file mode 100644
index d044af7..0000000
--- a/src/GLSLShaderTest/toon.vert
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Vertex shader for cartoon-style shading
-//
-// Author: Philip Rideout
-//
-// Copyright (c) 2004 3Dlabs Inc. Ltd.
-//
-// See 3Dlabs-License.txt for license information
-//
-
-varying vec3 Normal;
-varying vec3 LightDir;
-
-void main(void)
-{
-	Normal = normalize(gl_NormalMatrix * gl_Normal);
-	gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-	LightDir  = vec3(normalize(gl_LightSource[0].position));
-}