[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28918] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: bugfix [#22390] Lamp drawing circle bug

[Campbell Barton]

Revision: 28918
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28918
Author:   campbellbarton
Date:     2010-05-22 13:58:21 +0200 (Sat, 22 May 2010)

Log Message:
-----------
bugfix [#22390] Lamp drawing circle bug
was drawing the circle when out of view.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-05-22 11:55:17 UTC (rev 28917)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-05-22 11:58:21 UTC (rev 28918)
@@ -988,21 +988,23 @@
 			
 		/* Outer circle */
 		circrad = 3.0f*lampsize;
+		setlinestyle(3);
+
 		drawcircball(GL_LINE_LOOP, vec, circrad, imat);
-	}
-	else
-		circrad = 0.0f;
-	
-	setlinestyle(3);
 
-	/* draw dashed outer circle if shadow is on. remember some lamps can't have certain shadows! */
-	if (la->type!=LA_HEMI) {
-		if ((la->mode & LA_SHAD_RAY) ||
-			((la->mode & LA_SHAD_BUF) && (la->type==LA_SPOT)) )
-		{
-			drawcircball(GL_LINE_LOOP, vec, circrad + 3.0f*pixsize, imat);
+		/* draw dashed outer circle if shadow is on. remember some lamps can't have certain shadows! */
+		if(la->type!=LA_HEMI) {
+			if(	(la->mode & LA_SHAD_RAY) ||
+				((la->mode & LA_SHAD_BUF) && (la->type==LA_SPOT))
+			) {
+				drawcircball(GL_LINE_LOOP, vec, circrad + 3.0f*pixsize, imat);
+			}
 		}
 	}
+	else {
+		setlinestyle(3);
+		circrad = 0.0f;
+	}
 	
 	/* draw the pretty sun rays */
 	if(la->type==LA_SUN) {