svn merge -r 21041:21301 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
[blender.git] / source / blender / editors / curve / curve_ops.c
index c27c498f55ee182c8e8d1bc4c31b7ce4db080a60..66cde772f3e3f6f6946e327cea211af69090028f 100644 (file)
 
 static int specials_menu_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-       uiMenuItem *head;
-
-       head= uiPupMenuBegin("Specials", 0);
-       uiMenuItemO(head, 0, "CURVE_OT_subdivide");
-       uiMenuItemO(head, 0, "CURVE_OT_switch_direction");
-       uiMenuItemO(head, 0, "CURVE_OT_spline_weight_set");
-       uiMenuItemO(head, 0, "CURVE_OT_radius_set");
-       uiMenuItemO(head, 0, "CURVE_OT_smooth");
-       uiMenuItemO(head, 0, "CURVE_OT_smooth_radius");
-       uiPupMenuEnd(C, head);
+       uiPopupMenu *pup;
+       uiLayout *layout;
+
+       pup= uiPupMenuBegin(C, "Specials", 0);
+       layout= uiPupMenuLayout(pup);
+       uiItemO(layout, NULL, 0, "CURVE_OT_subdivide");
+       uiItemO(layout, NULL, 0, "CURVE_OT_switch_direction");
+       uiItemO(layout, NULL, 0, "CURVE_OT_spline_weight_set");
+       uiItemO(layout, NULL, 0, "CURVE_OT_radius_set");
+       uiItemO(layout, NULL, 0, "CURVE_OT_smooth");
+       uiItemO(layout, NULL, 0, "CURVE_OT_smooth_radius");
+       uiPupMenuEnd(C, pup);
 
        return OPERATOR_CANCELLED;
 }
@@ -104,7 +106,6 @@ void ED_operatortypes_curve(void)
        WM_operatortype_append(FONT_OT_case_set);
        WM_operatortype_append(FONT_OT_style_toggle);
        WM_operatortype_append(FONT_OT_style_set);
-       WM_operatortype_append(FONT_OT_material_set);
 
        WM_operatortype_append(FONT_OT_text_copy);
        WM_operatortype_append(FONT_OT_text_cut);