svn merge -r37335:37500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / editors / sculpt_paint / sculpt.c
index 9414cc00341320fa128509230e072a44a7833f8c..691170bd80a9a80cb133d12ff2e3291722a56c15 100644 (file)
@@ -3591,7 +3591,7 @@ static int sculpt_brush_stroke_exec(bContext *C, wmOperator *op)
        return OPERATOR_FINISHED;
 }
 
        return OPERATOR_FINISHED;
 }
 
-static int sculpt_brush_stroke_cacel(bContext *C, wmOperator *op)
+static int sculpt_brush_stroke_cancel(bContext *C, wmOperator *op)
 {
        Object *ob= CTX_data_active_object(C);
        SculptSession *ss = ob->sculpt;
 {
        Object *ob= CTX_data_active_object(C);
        SculptSession *ss = ob->sculpt;
@@ -3627,7 +3627,7 @@ static void SCULPT_OT_brush_stroke(wmOperatorType *ot)
        ot->modal= paint_stroke_modal;
        ot->exec= sculpt_brush_stroke_exec;
        ot->poll= sculpt_poll;
        ot->modal= paint_stroke_modal;
        ot->exec= sculpt_brush_stroke_exec;
        ot->poll= sculpt_poll;
-       ot->cancel= sculpt_brush_stroke_cacel;
+       ot->cancel= sculpt_brush_stroke_cancel;
 
        /* flags (sculpt does own undo? (ton) */
        ot->flag= OPTYPE_BLOCKING;
 
        /* flags (sculpt does own undo? (ton) */
        ot->flag= OPTYPE_BLOCKING;