[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38747] branches/soc-2011-onion: fixes missed renamed rna propertys and work-around for crash when trying to paint in wpaint /vpaint mode (wpaint/vpaint are disabled)

[Jason Wilkins]

Revision: 38747
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38747
Author:   jwilkins
Date:     2011-07-26 21:38:41 +0000 (Tue, 26 Jul 2011)
Log Message:
-----------
fixes missed renamed rna propertys and work-around for crash when trying to paint in wpaint/vpaint mode (wpaint/vpaint are disabled)

Modified Paths:
--------------
    branches/soc-2011-onion/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_vertex.c

Modified: branches/soc-2011-onion/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- branches/soc-2011-onion/release/scripts/startup/bl_ui/space_image.py	2011-07-26 20:58:18 UTC (rev 38746)
+++ branches/soc-2011-onion/release/scripts/startup/bl_ui/space_image.py	2011-07-26 21:38:41 UTC (rev 38747)
@@ -666,8 +666,8 @@
             row.prop(brush, "use_pressure_strength", toggle=True, text="")
 
             row = col.row(align=True)
-            row.prop(brush, "jitter", slider=True)
-            row.prop(brush, "use_pressure_jitter", toggle=True, text="")
+            row.prop(brush, "jitter_mouse", slider=True)
+            row.prop(brush, "use_pressure_jitter_mouse", toggle=True, text="")
 
             col.prop(brush, "blend", text="Blend")
 

Modified: branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_vertex.c	2011-07-26 20:58:18 UTC (rev 38746)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_vertex.c	2011-07-26 21:38:41 UTC (rev 38747)
@@ -1449,26 +1449,34 @@
 
 static int wpaint_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-#if 0 // SNIP
+#if 0
 	paint_stroke_new(
+		C,
 		op,
 		paint_brush_temp_switch,
 		paint_brush_temp_unswitch,
 		NULL,
 		wpaint_stroke_test_start,
+		NULL,
+		NULL,
 		wpaint_stroke_update_step,
 		NULL,
 		NULL,
 		NULL,
+		NULL,
+		NULL,
 		wpaint_stroke_done,
 		event->type);
-#endif
+
 	/* add modal handler */
 	WM_event_add_modal_handler(C, op);
 
 	op->type->modal(C, op, event);
 	
 	return OPERATOR_RUNNING_MODAL;
+#else
+	return OPERATOR_FINISHED;
+#endif
 }
 
 static int wpaint_cancel(bContext *C, wmOperator *op)
@@ -2169,13 +2177,16 @@
 		NULL,
 		vpaint_stroke_done,
 		event->type);
-#endif
+
 	/* add modal handler */
 	WM_event_add_modal_handler(C, op);
 
 	op->type->modal(C, op, event);
-	
+
 	return OPERATOR_RUNNING_MODAL;
+#else
+	return OPERATOR_FINISHED;
+#endif
 }
 
 static int vpaint_cancel(bContext *C, wmOperator *op)