2.5

[blender-staging.git] / source / blender / editors / sculpt_paint / paint_vertex.c

diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index c5aea5ae0778b65387a892d5a0c3e8452c6070d6..812c41f430eb36c0f44b12531f7f2eb94280319c 100644 (file)
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -1088,7 +1088,7 @@ static int set_wpaint(bContext *C, wmOperator *op)                /* toggle */
        Mesh *me;
        
        me= get_mesh(ob);
-       if(ob->id.lib || me==NULL) return OPERATOR_CANCELLED;
+       if(ob->id.lib || me==NULL) return OPERATOR_PASS_THROUGH;
        
        if(me && me->totface>=MAXINDEX) {
                error("Maximum number of faces: %d", MAXINDEX-1);
@@ -1465,7 +1465,7 @@ static int wpaint_invoke(bContext *C, wmOperator *op, wmEvent *event)
        // XXX  if(multires_level1_test()) return;
        
        me= get_mesh(ob);
-       if(me==NULL || me->totface==0) return OPERATOR_CANCELLED;
+       if(me==NULL || me->totface==0) return OPERATOR_PASS_THROUGH;
        
        /* if nothing was added yet, we make dverts and a vertex deform group */
        if (!me->dvert)
@@ -1585,7 +1585,7 @@ static int set_vpaint(bContext *C, wmOperator *op)                /* toggle */
        
        if(me==NULL || object_data_is_libdata(ob)) {
                G.f &= ~G_VERTEXPAINT;
-               return OPERATOR_FINISHED;
+               return OPERATOR_PASS_THROUGH;
        }
        
        if(me && me->totface>=MAXINDEX) {
@@ -1821,7 +1821,7 @@ static int vpaint_invoke(bContext *C, wmOperator *op, wmEvent *event)
        
        /* context checks could be a poll() */
        me= get_mesh(ob);
-       if(me==NULL || me->totface==0) return OPERATOR_CANCELLED;
+       if(me==NULL || me->totface==0) return OPERATOR_PASS_THROUGH;
        
        if(me->mcol==NULL) make_vertexcol(CTX_data_scene(C), 0);
        if(me->mcol==NULL) return OPERATOR_CANCELLED;