1 files changed, 18 insertions, 10 deletions

diff --git a/source/blender/editors/space_view3d/vpaint.c b/source/blender/editors/space_view3d/vpaint.c
index 80dbf05e049..41a343d0c5d 100644
--- a/source/blender/editors/space_view3d/vpaint.c
+++ b/source/blender/editors/space_view3d/vpaint.c
@@ -104,7 +104,6 @@
 #define MAXINDEX	512000
 
 /* XXX */
-static void BIF_undo_push() {}
 static void error() {}
 
 /* polling - retrieve whether cursor should be set or operator should be done */
@@ -397,7 +396,6 @@ void clear_vpaint(Scene *scene)
 		*to= paintcol;
 		to++; 
 	}
-	BIF_undo_push("Clear vertex colors");
 	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
 	
 }
@@ -430,7 +428,6 @@ void clear_vpaint_selectedfaces(Scene *scene)
 		}
 	}
 	
-	BIF_undo_push("Clear vertex colors");
 	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
 }
 
@@ -541,7 +538,6 @@ void clear_wpaint_selectedfaces(Scene *scene)
 	copy_wpaint_prev(wp, NULL, 0);
 
 	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-	BIF_undo_push("Set vertex weight");
 }
 
 
@@ -1207,6 +1203,9 @@ void VIEW3D_OT_wpaint_toggle(wmOperatorType *ot)
 	ot->exec= set_wpaint;
 	ot->poll= ED_operator_object_active;
 	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
 }
 
 /* ************ paint radial controls *************/
@@ -1257,7 +1256,6 @@ static int vpaint_radial_control_exec(bContext *C, wmOperator *op)
 	int ret = paint_radial_control_exec(op, CTX_data_scene(C)->toolsettings->vpaint);
 	char str[256];
 	WM_radial_control_string(op, str, 256);
-	ED_undo_push(C, str);	
 	return ret;
 }
 
@@ -1281,7 +1279,6 @@ static int wpaint_radial_control_exec(bContext *C, wmOperator *op)
 	int ret = paint_radial_control_exec(op, CTX_data_scene(C)->toolsettings->wpaint);
 	char str[256];
 	WM_radial_control_string(op, str, 256);
-	ED_undo_push(C, str);	
 	return ret;
 }
 
@@ -1296,6 +1293,9 @@ void VIEW3D_OT_wpaint_radial_control(wmOperatorType *ot)
 	ot->modal= wpaint_radial_control_modal;
 	ot->exec= wpaint_radial_control_exec;
 	ot->poll= wp_poll;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
 void VIEW3D_OT_vpaint_radial_control(wmOperatorType *ot)
@@ -1309,6 +1309,9 @@ void VIEW3D_OT_vpaint_radial_control(wmOperatorType *ot)
 	ot->modal= vpaint_radial_control_modal;
 	ot->exec= vpaint_radial_control_exec;
 	ot->poll= vp_poll;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
 /* ************ weight paint operator ********** */
@@ -1351,8 +1354,6 @@ static void wpaint_exit(bContext *C, wmOperator *op)
 	
 	DAG_object_flush_update(CTX_data_scene(C), ob, OB_RECALC_DATA);
 	
-	ED_undo_push(C, "Weight Paint");
-	
 	MEM_freeN(wpd);
 	op->customdata= NULL;
 }
@@ -1635,6 +1636,9 @@ void VIEW3D_OT_wpaint(wmOperatorType *ot)
 	/* ot->exec= vpaint_exec; <-- needs stroke property */
 	ot->poll= wp_poll;
 	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
 }
 
 
@@ -1706,6 +1710,9 @@ void VIEW3D_OT_vpaint_toggle(wmOperatorType *ot)
 	ot->exec= set_vpaint;
 	ot->poll= ED_operator_object_active;
 	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
 }
 
 
@@ -1751,8 +1758,6 @@ static void vpaint_exit(bContext *C, wmOperator *op)
 	/* frees prev buffer */
 	copy_vpaint_prev(ts->vpaint, NULL, 0);
 	
-	ED_undo_push(C, "Vertex Paint");
-	
 	MEM_freeN(vpd);
 	op->customdata= NULL;
 }
@@ -1929,6 +1934,9 @@ void VIEW3D_OT_vpaint(wmOperatorType *ot)
 	/* ot->exec= vpaint_exec; <-- needs stroke property */
 	ot->poll= vp_poll;
 	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
 }