2.5/Vertex paint:
[blender.git] / source / blender / editors / space_view3d / view3d_select.c
index 3966fc343c4edfaa3a471952cde355c1b73130f3..a6a42c0ba677f9fa4059e48bab4002e184159b23 100644 (file)
@@ -694,10 +694,12 @@ static void do_lasso_select_node(short mcords[][2], short moves, short select)
 
 void view3d_lasso_select(bContext *C, ViewContext *vc, short mcords[][2], short moves, short select)
 {
+       Object *ob = CTX_data_active_object(C);
+
        if(vc->obedit==NULL) {
-               if(paint_facesel_test(CTX_data_active_object(C)))
+               if(paint_facesel_test(ob))
                        do_lasso_select_facemode(vc, mcords, moves, select);
-               else if(G.f & (G_VERTEXPAINT|G_TEXTUREPAINT|G_WEIGHTPAINT))
+               else if(G.f & (G_TEXTUREPAINT|G_WEIGHTPAINT) || (ob && ob->mode & OB_MODE_VERTEX_PAINT))
                        ;
                else if(G.f & G_PARTICLEEDIT)
                        PE_lasso_select(C, mcords, moves, select);