[Bf-blender-cvs] [94bc1a40b44] blender2.8: Fix sculpt key bindings

[Campbell Barton]

Commit: 94bc1a40b44d6b6a955aa8ac56e6dc203f2f5cef
Author: Campbell Barton
Date:   Mon Jul 2 17:32:52 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB94bc1a40b44d6b6a955aa8ac56e6dc203f2f5cef

Fix sculpt key bindings

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

M	source/blender/editors/sculpt_paint/paint_ops.c

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

diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c
index c286d41f4b0..f89236dbbc1 100644
--- a/source/blender/editors/sculpt_paint/paint_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_ops.c
@@ -455,21 +455,19 @@ static int brush_select_exec(bContext *C, wmOperator *op)
 
 	/* TODO(campbell): Use the toolsystem for now, ideally the toolsystem will display brushes directly
 	 * so we don't need to sync between tools and brushes. */
-	if (false) {
-		return brush_generic_tool_set(
-		            bmain, paint, tool, tool_offset,
-		            paint_mode, tool_name, create_missing,
-		            toggle);
-	}
-	else {
+	int ret = brush_generic_tool_set(
+	        bmain, paint, tool, tool_offset,
+	        paint_mode, tool_name, create_missing,
+	        toggle);
+
+	if ((ret == OPERATOR_FINISHED) && (paint->brush != NULL)) {
+		Brush *brush = paint->brush;
 		WorkSpace *workspace = CTX_wm_workspace(C);
-		if (WM_toolsystem_ref_set_by_name(C, workspace, NULL, tool_name, true)) {
-			return OPERATOR_FINISHED;
-		}
-		else {
-			return OPERATOR_CANCELLED;
+		if (WM_toolsystem_ref_set_by_name(C, workspace, NULL, brush->id.name + 2, true)) {
+			/* ok */
 		}
 	}
+	return ret;
 }
 
 static void PAINT_OT_brush_select(wmOperatorType *ot)