[Bf-blender-cvs] [b3bb4a69363] blender2.8: Fix lamp draw setting color without checking if its needed

[Campbell Barton]

Commit: b3bb4a6936313a1358428ab95b0df96c93c9cd34
Author: Campbell Barton
Date:   Sat Mar 11 00:45:18 2017 +1100
Branches: blender2.8
https://developer.blender.org/rBb3bb4a6936313a1358428ab95b0df96c93c9cd34

Fix lamp draw setting color without checking if its needed

===================================================================

M	source/blender/editors/space_view3d/drawobject.c

===================================================================

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index d131c139814..8df34f4f890 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -227,8 +227,6 @@ static void drawcircle_size(float size, unsigned pos);
 static void draw_empty_sphere(float size, unsigned pos);
 static void draw_empty_cone(float size, unsigned pos);
 
-static void draw_box(const float vec[8][3], bool solid);
-
 static void ob_wire_color_blend_theme_id(const unsigned char ob_wire_col[4], const int theme_id, float fac, float r_col[3])
 {
 	float col_wire[3], col_bg[3];
@@ -1361,7 +1359,9 @@ void drawlamp(View3D *v3d, RegionView3D *rv3d, Base *base,
 	}
 	else {
 		immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
-		immUniformColor4fv(curcol);
+		if ((dflag & DRAW_CONSTCOLOR) == 0) {
+			immUniformColor4fv(curcol);
+		}
 		circrad = 0.0f;
 	}