diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-01 12:22:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-01 12:23:46 +0300 |
| commit | 2c9670b92d32e79d0f071475731bcaf79aae42f5 (patch) | |
| tree | 4087292d347f3731ccfbe68018776b3d8174e558 /source/blender/editors/sculpt_paint/paint_image.c | |
| parent | 1e8021a58af3757e8a4c2a543ddab622b75c00d0 (diff) | |
Tool System: support non-brush tools w/ paint modes
Allows select, gradient tools not to conflict with brush keymap.
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_image.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index dbb12282d0a..06df1632593 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -273,7 +273,9 @@ static int image_paint_poll(bContext *C) obact = CTX_data_active_object(C); if ((obact && obact->mode & OB_MODE_TEXTURE_PAINT) && CTX_wm_region_view3d(C)) { - return 1; + if (WM_toolsystem_active_tool_is_brush(C)) { + return 1; + } } else { SpaceImage *sima = CTX_wm_space_image(C); |