Undo revision 23130 which was a merge with 2.5, a messy one because I did something...
[blender.git] / source / blender / editors / space_view3d / view3d_select.c
index 42954e0..7743ede 100644 (file)
@@ -756,7 +756,6 @@ static int view3d_lasso_select_exec(bContext *C, wmOperator *op)
 void VIEW3D_OT_select_lasso(wmOperatorType *ot)
 {
        ot->name= "Lasso Select";
-       ot->description= "Select items using lasso selection.";
        ot->idname= "VIEW3D_OT_select_lasso";
        
        ot->invoke= WM_gesture_lasso_invoke;
@@ -1360,7 +1359,7 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
                        vc.em= me->edit_mesh;
                        do_mesh_box_select(&vc, &rect, (val==LEFTMOUSE));
 //                     if (EM_texFaceCheck())
-                       WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
+                       WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
                        
                }
                else if(ELEM(obedit->type, OB_CURVE, OB_SURF)) {
@@ -1535,7 +1534,6 @@ void VIEW3D_OT_select_border(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name= "Border Select";
-       ot->description= "Select items using border selection.";
        ot->idname= "VIEW3D_OT_select_border";
        
        /* api callbacks */
@@ -1595,7 +1593,6 @@ void VIEW3D_OT_select(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name= "Activate/Select";
-       ot->description= "Activate/select item(s).";
        ot->idname= "VIEW3D_OT_select";
        
        /* api callbacks */
@@ -1805,7 +1802,7 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op)
 
                if(CTX_data_edit_object(C)) {
                        obedit_circle_select(&vc, selecting, mval, (float)radius);
-                       WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obact->data);
+                       WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obact);
                }
                else
                        return PE_circle_select(C, selecting, mval, (float)radius);
@@ -1834,7 +1831,6 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op)
 void VIEW3D_OT_select_circle(wmOperatorType *ot)
 {
        ot->name= "Circle Select";
-       ot->description= "Select items using circle selection.";
        ot->idname= "VIEW3D_OT_select_circle";
        
        ot->invoke= WM_gesture_circle_invoke;