[Bf-blender-cvs] [c80415627e9] master: Fix T62223: Particle brushes disable select tools

[Campbell Barton]

Commit: c80415627e9c8e1d4eb74a34a0916126a0e9fc1a
Author: Campbell Barton
Date:   Wed Mar 6 21:48:22 2019 +1100
Branches: master
https://developer.blender.org/rBc80415627e9c8e1d4eb74a34a0916126a0e9fc1a

Fix T62223: Particle brushes disable select tools

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

M	source/blender/editors/physics/particle_edit.c

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

diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index f9b30de5dc5..a3173136783 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -2919,6 +2919,10 @@ static void brush_drawcursor(bContext *C, int x, int y, void *UNUSED(customdata)
 		return;
 	}
 
+	if (!WM_toolsystem_active_tool_is_brush(C)) {
+		return;
+	}
+
 	brush = &pset->brush[pset->brushtype];
 
 	if (brush) {
@@ -4084,8 +4088,13 @@ static int brush_edit_init(bContext *C, wmOperator *op)
 	BrushEdit *bedit;
 	float min[3], max[3];
 
-	if (pset->brushtype < 0)
+	if (pset->brushtype < 0) {
+		return 0;
+	}
+
+	if (!WM_toolsystem_active_tool_is_brush(C)) {
 		return 0;
+	}
 
 	/* set the 'distance factor' for grabbing (used in comb etc) */
 	INIT_MINMAX(min, max);