[Bf-blender-cvs] [12d28b3c4cb] master: UI: Outliner - Do not highlight icons of active lights

Harley Acheson noreply at git.blender.org
Mon May 20 19:55:40 CEST 2019


Commit: 12d28b3c4cb839f540912d87c36595391ececdaa
Author: Harley Acheson
Date:   Mon May 20 10:54:17 2019 -0700
Branches: master
https://developer.blender.org/rB12d28b3c4cb839f540912d87c36595391ececdaa

UI: Outliner - Do not highlight icons of active lights

This removes the extra highlighting of lights that are active as this is not supported

Differential Revision: https://developer.blender.org/D4903

Reviewed by Brecht Van Lommel

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

M	source/blender/editors/space_outliner/outliner_select.c

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

diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index c6fcf1d8cf7..ae17158829c 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -450,32 +450,6 @@ static eOLDrawState tree_element_active_material(bContext *C,
   return OL_DRAWSEL_NONE;
 }
 
-static eOLDrawState tree_element_active_light(bContext *UNUSED(C),
-                                              Scene *UNUSED(scene),
-                                              ViewLayer *view_layer,
-                                              SpaceOutliner *soops,
-                                              TreeElement *te,
-                                              const eOLSetState set)
-{
-  Object *ob;
-
-  /* we search for the object parent */
-  ob = (Object *)outliner_search_back(soops, te, ID_OB);
-  if (ob == NULL || ob != OBACT(view_layer)) {
-    /* just paranoia */
-    return OL_DRAWSEL_NONE;
-  }
-
-  if (set != OL_SETSEL_NONE) {
-    // XXX      extern_set_butspace(F5KEY, 0);
-  }
-  else {
-    return OL_DRAWSEL_NORMAL;
-  }
-
-  return OL_DRAWSEL_NONE;
-}
-
 static eOLDrawState tree_element_active_camera(bContext *UNUSED(C),
                                                Scene *scene,
                                                ViewLayer *UNUSED(sl),
@@ -1041,8 +1015,6 @@ eOLDrawState tree_element_active(bContext *C,
       return tree_element_active_material(C, scene, view_layer, soops, te, set);
     case ID_WO:
       return tree_element_active_world(C, scene, view_layer, soops, te, set);
-    case ID_LA:
-      return tree_element_active_light(C, scene, view_layer, soops, te, set);
     case ID_TXT:
       return tree_element_active_text(C, scene, view_layer, soops, te, set);
     case ID_CA:



More information about the Bf-blender-cvs mailing list