remove line added previous commit, Cancel for view rotate button should be Confirm
authorCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jan 2010 23:57:08 +0000 (23:57 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jan 2010 23:57:08 +0000 (23:57 +0000)
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/space_view3d/view3d_edit.c

index 8d2b9a8..74546b5 100644 (file)
@@ -367,8 +367,6 @@ static void v3d_editvertex_buts(const bContext *C, uiLayout *layout, View3D *v3d
                else if(totedge>1)
                        uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, "Median Crease:",    0, 20, 200, 20, &(tfp->ve_median[3]), 0.0, 1.0, 10, 3, "");
                
-
-               uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, "Median Crease:",    0, 20, 200, 20, &(tfp->ve_median[3]), 0.0, 1.0, 10, 3, "");
        }
        else {  // apply
                memcpy(ve_median, tfp->ve_median, sizeof(tfp->ve_median));
index a3a4640..7f1d30b 100644 (file)
@@ -453,7 +453,7 @@ enum {
 void viewrotate_modal_keymap(wmKeyConfig *keyconf)
 {
        static EnumPropertyItem modal_items[] = {
-       {VIEW_MODAL_CONFIRM,    "CONFIRM", 0, "Cancel", ""},
+       {VIEW_MODAL_CONFIRM,    "CONFIRM", 0, "Confirm", ""},
 
        {VIEWROT_MODAL_AXIS_SNAP_ENABLE,        "AXIS_SNAP_ENABLE", 0, "Enable Axis Snap", ""},
        {VIEWROT_MODAL_AXIS_SNAP_DISABLE,       "AXIS_SNAP_DISABLE", 0, "Disable Axis Snap", ""},