X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogram.cpp;h=729018a1a4b1edc69438d426c32426e82b19b09b;hp=f11206677b94890ebe7d89dfdeefbc5af425e7f4;hb=01d2500733766710f4a11f49216a5b3dcc75a4a3;hpb=a6c45f5cc50ea2ee2aecf8d4f3b69934e69c8f3f

diff --git a/source/program.cpp b/source/program.cpp
index f1120667..729018a1 100644
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -79,9 +79,10 @@ const char *standard_fragment_src[] =
 	"e",   "\tvec4 reflection = textureCube(environment, n_normal*(dot(n_normal, v_eye_dir)*2.0)-v_eye_dir);\n",
 	"t",   "\tvec4 tex_sample = texture2D(texture, v_texcoord);\n",
 	 0,    "\tgl_FragColor.rgb = ",
-	"!t!l!m", "vec3(1.0)",
+	"!t!m",  "vec3(1.0)",
 	"t",     "tex_sample.rgb",
 	"l|mt",  "*",
+	"l!m!t",  "*",
 	"!lm",   "v_color.rgb",
 	"l",     "((l_diffuse",
 	"lm",    "*gl_FrontLightProduct[0].diffuse.rgb",
@@ -94,10 +95,11 @@ const char *standard_fragment_src[] =
 	"e",     "+reflection.rgb*reflectivity",
 	 0,      ";\n",
 	 0,    "\tgl_FragColor.a = ",
-	"!m",    "1.0",
+	"!t!m",  "1.0",
+	"t",     "tex_sample.a",
+	"tm",    "*",
 	"!lm",   "v_color.a",
 	"lm",    "gl_FrontMaterial.diffuse.a",
-	"t",     "*tex_sample.a",
 	 0,      ";\n",
 	 0,    "}\n",
 	0, 0