diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-03-06 13:48:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-06 13:48:22 +0300 |
| commit | c80415627e9c8e1d4eb74a34a0916126a0e9fc1a (patch) | |
| tree | 7d0628e594d4b37962f2ad7b0c3725a7a8b3a99b /source/blender/editors/physics | |
| parent | 37fa8b0cf9e4ba0e21a4d807db79841eca1a1e08 (diff) | |
Fix T62223: Particle brushes disable select tools
Diffstat (limited to 'source/blender/editors/physics')
| -rw-r--r-- | source/blender/editors/physics/particle_edit.c | 11 |
1 files changed, 10 insertions, 1 deletions
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); |