diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-07 03:58:57 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-07 03:59:41 +0300 |
| commit | 101fd08348e5717f98af93481e6cc97d3bf920c3 (patch) | |
| tree | 32a8130570ed435290656f48c7af8bfde7e96532 /source/blender/editors/sculpt_paint/paint_cursor.c | |
| parent | 4e9911663a22766f6751d33ae84c1ebcc1fae559 (diff) | |
| parent | 59e70d5f8d68d8fa9eb34f75866578fafece8709 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_cursor.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_cursor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index 294981e7303..dfad5afc9dc 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -802,7 +802,7 @@ static void paint_draw_alpha_overlay( ViewContext *vc, int x, int y, float zoom, ePaintMode mode) { /* color means that primary brush texture is colured and secondary is used for alpha/mask control */ - bool col = ELEM(mode, ePaintTextureProjective, ePaintTexture2D, ePaintVertex) ? true : false; + bool col = ELEM(mode, ePaintTexture3D, ePaintTexture2D, ePaintVertex) ? true : false; eOverlayControlFlags flags = BKE_paint_get_overlay_flags(); gpuPushAttrib(GPU_DEPTH_BUFFER_BIT | GPU_BLEND_BIT); @@ -1033,7 +1033,7 @@ static void paint_cursor_on_hit( static bool ommit_cursor_drawing(Paint *paint, ePaintMode mode, Brush *brush) { if (paint->flags & PAINT_SHOW_BRUSH) { - if (ELEM(mode, ePaintTexture2D, ePaintTextureProjective) && brush->imagepaint_tool == PAINT_TOOL_FILL) { + if (ELEM(mode, ePaintTexture2D, ePaintTexture3D) && brush->imagepaint_tool == PAINT_TOOL_FILL) { return true; } return false; |