[Bf-blender-cvs] [17daf917ee4] master: Cleanup: Remove unused outliner enum values

[Nathan Craddock]

Commit: 17daf917ee45b8824f5f3f663e1a1db618f73074
Author: Nathan Craddock
Date:   Thu Feb 11 21:32:30 2021 -0700
Branches: master
https://developer.blender.org/rB17daf917ee45b8824f5f3f663e1a1db618f73074

Cleanup: Remove unused outliner enum values

Removes values from various Outliner context menu enums that were unused.
Many of these had been commented out for years. Also deletes some
unused code related to the removed enums. No functional changes.

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

M	source/blender/editors/space_outliner/outliner_intern.h
M	source/blender/editors/space_outliner/outliner_tools.c

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

diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index 339cc3068d0..b65b1a57143 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -388,21 +388,6 @@ void id_remap_fn(struct bContext *C,
                  struct TreeStoreElem *tselem,
                  void *user_data);
 
-void item_object_mode_enter_fn(struct bContext *C,
-                               struct ReportList *reports,
-                               struct Scene *scene,
-                               TreeElement *te,
-                               struct TreeStoreElem *tsep,
-                               struct TreeStoreElem *tselem,
-                               void *user_data);
-void item_object_mode_exit_fn(struct bContext *C,
-                              struct ReportList *reports,
-                              struct Scene *scene,
-                              TreeElement *te,
-                              struct TreeStoreElem *tsep,
-                              struct TreeStoreElem *tselem,
-                              void *user_data);
-
 void outliner_set_coordinates(struct ARegion *region, struct SpaceOutliner *space_outliner);
 
 void outliner_item_openclose(struct SpaceOutliner *space_outliner,
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index 8b522d41af8..8bc32f5f3a7 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -1439,13 +1439,7 @@ enum {
   OL_OP_DESELECT,
   OL_OP_SELECT_HIERARCHY,
   OL_OP_REMAP,
-  OL_OP_LOCALIZED, /* disabled, see below */
-  OL_OP_TOGVIS,
-  OL_OP_TOGSEL,
-  OL_OP_TOGREN,
   OL_OP_RENAME,
-  OL_OP_OBJECT_MODE_ENTER,
-  OL_OP_OBJECT_MODE_EXIT,
   OL_OP_PROXY_TO_OVERRIDE_CONVERT,
 };
 
@@ -1459,8 +1453,6 @@ static const EnumPropertyItem prop_object_op_types[] = {
      "Remap Users",
      "Make all users of selected data-blocks to use instead a new chosen one"},
     {OL_OP_RENAME, "RENAME", 0, "Rename", ""},
-    {OL_OP_OBJECT_MODE_ENTER, "OBJECT_MODE_ENTER", 0, "Enter Mode", ""},
-    {OL_OP_OBJECT_MODE_EXIT, "OBJECT_MODE_EXIT", 0, "Exit Mode", ""},
     {OL_OP_PROXY_TO_OVERRIDE_CONVERT,
      "OBJECT_PROXY_TO_OVERRIDE",
      0,
@@ -1525,11 +1517,6 @@ static int outliner_object_operation_exec(bContext *C, wmOperator *op)
     /* No undo push here, operator does it itself (since it's a modal one, the op_undo_depth
      * trick does not work here). */
   }
-  else if (event == OL_OP_LOCALIZED) { /* disabled, see above enum (ton) */
-    outliner_do_object_operation(
-        C, op->reports, scene, space_outliner, &space_outliner->tree, id_local_fn);
-    str = "Localized Objects";
-  }
   else if (event == OL_OP_RENAME) {
     outliner_do_object_operation(
         C, op->reports, scene, space_outliner, &space_outliner->tree, item_rename_fn);
@@ -2444,9 +2431,6 @@ typedef enum eOutliner_AnimDataOps {
 
   OUTLINER_ANIMOP_REFRESH_DRV,
   OUTLINER_ANIMOP_CLEAR_DRV
-
-  /* OUTLINER_ANIMOP_COPY_DRIVERS, */
-  /* OUTLINER_ANIMOP_PASTE_DRIVERS */
 } eOutliner_AnimDataOps;
 
 static const EnumPropertyItem prop_animdata_op_types[] = {
@@ -2458,8 +2442,6 @@ static const EnumPropertyItem prop_animdata_op_types[] = {
     {OUTLINER_ANIMOP_SET_ACT, "SET_ACT", 0, "Set Action", ""},
     {OUTLINER_ANIMOP_CLEAR_ACT, "CLEAR_ACT", 0, "Unlink Action", ""},
     {OUTLINER_ANIMOP_REFRESH_DRV, "REFRESH_DRIVERS", 0, "Refresh Drivers", ""},
-    /* {OUTLINER_ANIMOP_COPY_DRIVERS, "COPY_DRIVERS", 0, "Copy Drivers", ""}, */
-    /* {OUTLINER_ANIMOP_PASTE_DRIVERS, "PASTE_DRIVERS", 0, "Paste Drivers", ""}, */
     {OUTLINER_ANIMOP_CLEAR_DRV, "CLEAR_DRIVERS", 0, "Clear Drivers", ""},
     {0, NULL, 0, NULL, NULL},
 };