Index: renderer/tr_shade.c
===================================================================
--- renderer/tr_shade.c	(revision 322)
+++ renderer/tr_shade.c	(working copy)
@@ -430,6 +430,7 @@
 	float	radius;
 	vec3_t	floatColor;
 	float	modulate;
+	float	flux;
 
 	if ( !backEnd.refdef.num_dlights ) {
 		return;
@@ -487,40 +488,45 @@
 			dist0 = origin0 - tess.xyz[i][0];
 			dist1 = origin1 - tess.xyz[i][1];
 			dist2 = origin2 - tess.xyz[i][2];
-			texCoords0 = 0.5f + dist0 * scale;
-			texCoords1 = 0.5f + dist1 * scale;
+			clip = 0;
+			flux = dist0 * tess.normal[i][0] + dist1 * tess.normal[i][1] + dist2 * tess.normal[i][2];
 
-			clip = 0;
-			if ( texCoords0 < 0.0f ) {
-				clip |= 1;
-			} else if ( texCoords0 > 1.0f ) {
-				clip |= 2;
-			}
-			if ( texCoords1 < 0.0f ) {
-				clip |= 4;
-			} else if ( texCoords1 > 1.0f ) {
-				clip |= 8;
-			}
-			texCoords[0] = texCoords0;
-			texCoords[1] = texCoords1;
-			
-			// modulate the strength based on the height and color
-			if ( dist2 > radius ) {
-				clip |= 16;
-				modulate = 0.0f;
-			} else if ( dist2 < -radius ) {
+			if ( flux < 0 ) {		// If dynamic light is behind surface, turn off.
 				clip |= 32;
 				modulate = 0.0f;
 			} else {
-				dist2 = Q_fabs(dist2);
-				if ( dist2 < radius * 0.5f ) {
-					modulate = 1.0f;
+				texCoords0 = 0.5f + dist0 * scale;
+				texCoords1 = 0.5f + dist1 * scale;
+				if ( texCoords0 < 0.0f ) {
+					clip |= 1;
+				} else if ( texCoords0 > 1.0f ) {
+					clip |= 2;
+				}
+				if ( texCoords1 < 0.0f ) {
+					clip |= 4;
+				} else if ( texCoords1 > 1.0f ) {
+					clip |= 8;
+				}
+				texCoords[0] = texCoords0;
+				texCoords[1] = texCoords1;
+			
+				// modulate the strength based on the height and color
+				if ( dist2 > radius ) {
+					clip |= 16;
+					modulate = 0.0f;
+				} else if ( dist2 < -radius ) {
+					clip |= 32;
+					modulate = 0.0f;
 				} else {
-					modulate = 2.0f * (radius - dist2) * scale;
+					dist2 = Q_fabs(dist2);
+					if ( dist2 < radius * 0.5f ) {
+						modulate = 1.0f;
+					} else {
+						modulate = 2.0f * (radius - dist2) * scale;
+					}
 				}
+				clipBits[i] = clip;
 			}
-			clipBits[i] = clip;
-
 			modulateVec = vec_ld(0,(float *)&modulate);
 			modulateVec = vec_perm(modulateVec,modulateVec,modulatePerm);
 			colorVec = vec_madd(floatColorVec0,modulateVec,zero);
@@ -531,37 +537,43 @@
 			vec_ste((vector unsigned int)colorChar,0,(unsigned int *)colors);	// store color
 #else
 			VectorSubtract( origin, tess.xyz[i], dist );
-			texCoords[0] = 0.5f + dist[0] * scale;
-			texCoords[1] = 0.5f + dist[1] * scale;
+			clip = 0;
+			flux = DotProduct(dist, tess.normal[i]);
 
-			clip = 0;
-			if ( texCoords[0] < 0.0f ) {
-				clip |= 1;
-			} else if ( texCoords[0] > 1.0f ) {
-				clip |= 2;
-			}
-			if ( texCoords[1] < 0.0f ) {
-				clip |= 4;
-			} else if ( texCoords[1] > 1.0f ) {
-				clip |= 8;
-			}
-			// modulate the strength based on the height and color
-			if ( dist[2] > radius ) {
-				clip |= 16;
-				modulate = 0.0f;
-			} else if ( dist[2] < -radius ) {
+			if ( flux < 0 ) {    // If dynamic light is behind surface, turn off.
 				clip |= 32;
 				modulate = 0.0f;
 			} else {
-				dist[2] = Q_fabs(dist[2]);
-				if ( dist[2] < radius * 0.5f ) {
-					modulate = 1.0f;
+				texCoords[0] = 0.5f + dist[0] * scale;
+				texCoords[1] = 0.5f + dist[1] * scale;
+
+				if ( texCoords[0] < 0.0f ) {
+					clip |= 1;
+				} else if ( texCoords[0] > 1.0f ) {
+					clip |= 2;
+				}
+				if ( texCoords[1] < 0.0f ) {
+					clip |= 4;
+				} else if ( texCoords[1] > 1.0f ) {
+					clip |= 8;
+				}
+				// modulate the strength based on the height and color
+				if ( dist[2] > radius ) {
+					clip |= 16;
+					modulate = 0.0f;
+				} else if ( dist[2] < -radius ) {
+					clip |= 32;
+					modulate = 0.0f;
 				} else {
-					modulate = 2.0f * (radius - dist[2]) * scale;
+					dist[2] = Q_fabs(dist[2]);
+					if ( dist[2] < radius * 0.5f ) {
+						modulate = 1.0f;
+					} else {
+						modulate = 2.0f * (radius - dist[2]) * scale;
+					}
 				}
+				clipBits[i] = clip;
 			}
-			clipBits[i] = clip;
-
 			colors[0] = myftol(floatColor[0] * modulate);
 			colors[1] = myftol(floatColor[1] * modulate);
 			colors[2] = myftol(floatColor[2] * modulate);