[Bf-blender-cvs] [6f49d97] blender-v2.77-release: Fix T47818: GPencil Sculpt Brush settings update when adjusted using scrollwheel while sculpting

[Joshua Leung]

Commit: 6f49d970e0e10e8e0666abd1c547689c1b8ad5d7
Author: Joshua Leung
Date:   Thu Mar 17 01:12:30 2016 +1300
Branches: blender-v2.77-release
https://developer.blender.org/rB6f49d970e0e10e8e0666abd1c547689c1b8ad5d7

Fix T47818: GPencil Sculpt Brush settings update when adjusted using scrollwheel while sculpting

===================================================================

M	source/blender/editors/gpencil/gpencil_brush.c

===================================================================

diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c
index 5360f07..9531444 100644
--- a/source/blender/editors/gpencil/gpencil_brush.c
+++ b/source/blender/editors/gpencil/gpencil_brush.c
@@ -1537,6 +1537,7 @@ static int gpsculpt_brush_modal(bContext *C, wmOperator *op, const wmEvent *even
 	tGP_BrushEditData *gso = op->customdata;
 	const bool is_modal = RNA_boolean_get(op->ptr, "wait_for_input");
 	bool redraw_region = false;
+	bool redraw_toolsettings = false;
 	
 	/* The operator can be in 2 states: Painting and Idling */
 	if (gso->is_painting) {
@@ -1575,8 +1576,9 @@ static int gpsculpt_brush_modal(bContext *C, wmOperator *op, const wmEvent *even
 					gso->brush->size += 3;
 					CLAMP_MAX(gso->brush->size, 300);
 				}
-					
+				
 				redraw_region = true;
+				redraw_toolsettings = true;
 				break;
 			
 			case WHEELDOWNMOUSE: 
@@ -1591,8 +1593,9 @@ static int gpsculpt_brush_modal(bContext *C, wmOperator *op, const wmEvent *even
 					gso->brush->size -= 3;
 					CLAMP_MIN(gso->brush->size, 1);
 				}
-					
+				
 				redraw_region = true;
+				redraw_toolsettings = true;
 				break;
 			
 			/* Painting mbut release = Stop painting (back to idle) */
@@ -1664,8 +1667,9 @@ static int gpsculpt_brush_modal(bContext *C, wmOperator *op, const wmEvent *even
 					gso->brush->size += 3;
 					CLAMP_MAX(gso->brush->size, 300);
 				}
-					
+				
 				redraw_region = true;
+				redraw_toolsettings = true;
 				break;
 			
 			case WHEELDOWNMOUSE: 
@@ -1680,8 +1684,9 @@ static int gpsculpt_brush_modal(bContext *C, wmOperator *op, const wmEvent *even
 					gso->brush->size -= 3;
 					CLAMP_MIN(gso->brush->size, 1);
 				}
-					
+				
 				redraw_region = true;
+				redraw_toolsettings = true;
 				break;
 			
 			/* Change Frame - Allowed */
@@ -1703,6 +1708,11 @@ static int gpsculpt_brush_modal(bContext *C, wmOperator *op, const wmEvent *even
 		ED_region_tag_redraw(ar);
 	}
 	
+	/* Redraw toolsettings (brush settings)? */
+	if (redraw_toolsettings) {
+		WM_event_add_notifier(C, NC_SCENE | ND_TOOLSETTINGS, NULL);
+	}
+	
 	return OPERATOR_RUNNING_MODAL;
 }