[Bf-blender-cvs] [fb58cc8dc94] modifier-panels-ui: Revert "Add Modifier Apply Button Extras Menu"

[Hans Goudey]

Commit: fb58cc8dc94ad6622648b16f82c31510e3c22563
Author: Hans Goudey
Date:   Thu Apr 9 12:23:39 2020 -0500
Branches: modifier-panels-ui
https://developer.blender.org/rBfb58cc8dc94ad6622648b16f82c31510e3c22563

Revert "Add Modifier Apply Button Extras Menu"

This reverts commit 824f80a5d71aadd03f2462a570e7fea8b5f5c95d.

After some discussion, it's clear this isn't really an improvement.

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

M	source/blender/modifiers/intern/MOD_ui_common.c

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

diff --git a/source/blender/modifiers/intern/MOD_ui_common.c b/source/blender/modifiers/intern/MOD_ui_common.c
index 2a20365bce0..d28ee8cfcf1 100644
--- a/source/blender/modifiers/intern/MOD_ui_common.c
+++ b/source/blender/modifiers/intern/MOD_ui_common.c
@@ -171,45 +171,6 @@ void modifier_panel_get_property_pointers(const bContext *C,
   uiLayoutSetContextPointer(panel->layout, "modifier", r_md_ptr);
 }
 
-static void modifier_extras_menu(bContext *UNUSED(C), uiLayout *layout, void *md_v)
-{
-  ModifierData *md = (ModifierData *)md_v;
-
-  if (modifier_isSameTopology(md) && !modifier_isNonGeometrical(md)) {
-    uiItemEnumO(layout,
-                "OBJECT_OT_modifier_apply",
-                CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Apply as Shape Key"),
-                0,
-                "apply_as",
-                MODIFIER_APPLY_SHAPE);
-  }
-
-  if (md->prev) {
-    PointerRNA op_ptr;
-    uiItemFullO(layout,
-                "OBJECT_OT_modifier_move_up",
-                IFACE_("Move Up"),
-                ICON_NONE,
-                NULL,
-                WM_OP_EXEC_DEFAULT,
-                0,
-                &op_ptr);
-    RNA_string_set(&op_ptr, "modifier", md->name);
-  }
-  if (md->next) {
-    PointerRNA op_ptr;
-    uiItemFullO(layout,
-                "OBJECT_OT_modifier_move_down",
-                IFACE_("Move Down"),
-                ICON_NONE,
-                NULL,
-                WM_OP_EXEC_DEFAULT,
-                0,
-                &op_ptr);
-    RNA_string_set(&op_ptr, "modifier", md->name);
-  }
-}
-
 #define ERROR_LIBDATA_MESSAGE TIP_("Can't edit external library data")
 void modifier_panel_buttons(const bContext *C, Panel *panel)
 {
@@ -255,7 +216,14 @@ void modifier_panel_buttons(const bContext *C, Panel *panel)
                 "apply_as",
                 MODIFIER_APPLY_DATA);
 
-    uiItemMenuF(sub, "", ICON_DOWNARROW_HLT, modifier_extras_menu, md);
+    if (modifier_isSameTopology(md) && !modifier_isNonGeometrical(md)) {
+      uiItemEnumO(sub,
+                  "OBJECT_OT_modifier_apply",
+                  CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Apply as Shape Key"),
+                  0,
+                  "apply_as",
+                  MODIFIER_APPLY_SHAPE);
+    }
   }
 
   if (!ELEM(md->type,