[Bf-blender-cvs] [c460b7e0c69] master: Fix T70112: Spot cone prevents selection

[Campbell Barton]

Commit: c460b7e0c69e233f4b8dbdb8b12cb96a63e1ca94
Author: Campbell Barton
Date:   Sat Sep 21 00:18:07 2019 +1000
Branches: master
https://developer.blender.org/rBc460b7e0c69e233f4b8dbdb8b12cb96a63e1ca94

Fix T70112: Spot cone prevents selection

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

M       source/blender/draw/modes/object_mode.c

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

diff --git a/source/blender/draw/modes/object_mode.c 
b/source/blender/draw/modes/object_mode.c
index dc7523e4091..97e6c2dd6f1 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -1880,9 +1880,10 @@ static void DRW_shgroup_light(OBJECT_ShadingGroupList 
*sgl, Object *ob, ViewLaye
       }
 
       if (la->mode & LA_SHOW_CONE) {
-
-        DRW_buffer_add_entry(sgl->light_spot_volume_rect, cone_inside, &one, 
shapemat);
-        DRW_buffer_add_entry(sgl->light_spot_volume_rect_outside, 
cone_outside, &one, shapemat);
+        if (!DRW_state_is_select()) {
+          DRW_buffer_add_entry(sgl->light_spot_volume_rect, cone_inside, &one, 
shapemat);
+          DRW_buffer_add_entry(sgl->light_spot_volume_rect_outside, 
cone_outside, &one, shapemat);
+        }
       }
     }
     else {
@@ -1896,8 +1897,10 @@ static void DRW_shgroup_light(OBJECT_ShadingGroupList 
*sgl, Object *ob, ViewLaye
       }
 
       if (la->mode & LA_SHOW_CONE) {
-        DRW_buffer_add_entry(sgl->light_spot_volume, cone_inside, &one, 
shapemat);
-        DRW_buffer_add_entry(sgl->light_spot_volume_outside, cone_outside, 
&one, shapemat);
+        if (!DRW_state_is_select()) {
+          DRW_buffer_add_entry(sgl->light_spot_volume, cone_inside, &one, 
shapemat);
+          DRW_buffer_add_entry(sgl->light_spot_volume_outside, cone_outside, 
&one, shapemat);
+        }
       }
     }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs