[Bf-blender-cvs] [59ef43147ee] master: Cleanup: Remove unused outliner activation code

Nathan Craddock noreply at git.blender.org
Fri Jul 3 21:43:59 CEST 2020


Commit: 59ef43147eedf053fb529d67a87e6facad530f65
Author: Nathan Craddock
Date:   Fri Jul 3 12:48:00 2020 -0600
Branches: master
https://developer.blender.org/rB59ef43147eedf053fb529d67a87e6facad530f65

Cleanup: Remove unused outliner activation code

No functional changes. Remove commented calls to extern_set_butspace
and unused text activation code.

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

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 5f025f08130..638f63cce62 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -550,10 +550,7 @@ static eOLDrawState tree_element_active_world(bContext *C,
   }
 
   if (tep == NULL || tselem->id == (ID *)scene) {
-    if (set != OL_SETSEL_NONE) {
-      // XXX          extern_set_butspace(F8KEY, 0);
-    }
-    else {
+    if (set == OL_SETSEL_NONE) {
       return OL_DRAWSEL_NORMAL;
     }
   }
@@ -840,8 +837,6 @@ static eOLDrawState tree_element_active_modifier(bContext *C,
     Object *ob = (Object *)tselem->id;
 
     WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
-
-    // XXX      extern_set_butspace(F9KEY, 0);
   }
 
   return OL_DRAWSEL_NONE;
@@ -857,8 +852,6 @@ static eOLDrawState tree_element_active_psys(bContext *C,
     Object *ob = (Object *)tselem->id;
 
     WM_event_add_notifier(C, NC_OBJECT | ND_PARTICLE | NA_EDITED, ob);
-
-    // XXX      extern_set_butspace(F7KEY, 0);
   }
 
   return OL_DRAWSEL_NONE;
@@ -875,23 +868,11 @@ static int tree_element_active_constraint(bContext *C,
     Object *ob = (Object *)tselem->id;
 
     WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT, ob);
-    // XXX      extern_set_butspace(F7KEY, 0);
   }
 
   return OL_DRAWSEL_NONE;
 }
 
-static eOLDrawState tree_element_active_text(bContext *UNUSED(C),
-                                             Scene *UNUSED(scene),
-                                             ViewLayer *UNUSED(sl),
-                                             SpaceOutliner *UNUSED(soops),
-                                             TreeElement *UNUSED(te),
-                                             int UNUSED(set))
-{
-  // XXX removed
-  return OL_DRAWSEL_NONE;
-}
-
 static eOLDrawState tree_element_active_pose(bContext *UNUSED(C),
                                              Scene *UNUSED(scene),
                                              ViewLayer *view_layer,
@@ -1071,8 +1052,6 @@ eOLDrawState tree_element_active(bContext *C,
       return tree_element_active_material(C, tvc->scene, tvc->view_layer, te, set);
     case ID_WO:
       return tree_element_active_world(C, tvc->scene, tvc->view_layer, soops, te, set);
-    case ID_TXT:
-      return tree_element_active_text(C, tvc->scene, tvc->view_layer, soops, te, set);
     case ID_CA:
       return tree_element_active_camera(C, tvc->scene, tvc->view_layer, te, set);
   }



More information about the Bf-blender-cvs mailing list