diff options
author | Antonioya <blendergit@gmail.com> | 2019-04-30 12:27:33 +0300 |
---|---|---|
committer | Antonioya <blendergit@gmail.com> | 2019-04-30 12:27:33 +0300 |
commit | 4d889897bae2b47b330913da0170e089df9a8130 (patch) | |
tree | e6a6d260e4f53e6aaeeef5b88473553bccfa6908 /source/blender | |
parent | 546e20f5a2c090da9328e44af2c9d5b6d4cb1fb9 (diff) |
Fix T63592 issue with control points.
This is a missing fix in previous commit of this task.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_draw_utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c index f28c6fa11b5..1f50b76ac82 100644 --- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c +++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c @@ -1456,6 +1456,7 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data *e_data, View3D *v3d = draw_ctx->v3d; const bool overlay = v3d != NULL ? (bool)((v3d->flag2 & V3D_HIDE_OVERLAYS) == 0) : true; Brush *brush = BKE_paint_brush(&ts->gp_paint->paint); + const bool is_paint_tool = (bool)((brush) && (brush->gpencil_tool == GPAINT_TOOL_DRAW)); bGPdata *gpd_eval = ob->data; /* need the original to avoid cow overhead while drawing */ bGPdata *gpd = (bGPdata *)DEG_get_original_id(&gpd_eval->id); @@ -1581,7 +1582,7 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data *e_data, const bool is_show_gizmo = (((v3d->gizmo_flag & V3D_GIZMO_HIDE) == 0) && ((v3d->gizmo_flag & V3D_GIZMO_HIDE_TOOL) == 0)); - if ((overlay) && (is_cppoint || is_speed_guide) && (is_show_gizmo) && + if ((overlay) && (is_paint_tool) && (is_cppoint || is_speed_guide) && (is_show_gizmo) && ((gpd->runtime.sbuffer_sflag & GP_STROKE_ERASER) == 0)) { DRWShadingGroup *shgrp = DRW_shgroup_create(e_data->gpencil_edit_point_sh, psl->drawing_pass); const float *viewport_size = DRW_viewport_size_get(); |