[Bf-blender-cvs] [a58765031fd] temp-gpencil-bezier-stroke-type: GPencil: Hide handles in stroke mode
Falk David
noreply at git.blender.org
Fri Apr 16 10:13:08 CEST 2021
Commit: a58765031fd044fad649262ed390826cdf6c66b7
Author: Falk David
Date: Fri Apr 16 10:12:51 2021 +0200
Branches: temp-gpencil-bezier-stroke-type
https://developer.blender.org/rBa58765031fd044fad649262ed390826cdf6c66b7
GPencil: Hide handles in stroke mode
Note that this does not show the stroke selection for bezier strokes
yet. This would likely have to be implemented in a new shader.
===================================================================
M source/blender/draw/engines/overlay/overlay_gpencil.c
===================================================================
diff --git a/source/blender/draw/engines/overlay/overlay_gpencil.c b/source/blender/draw/engines/overlay/overlay_gpencil.c
index b5f6d973692..16b3536c6de 100644
--- a/source/blender/draw/engines/overlay/overlay_gpencil.c
+++ b/source/blender/draw/engines/overlay/overlay_gpencil.c
@@ -143,18 +143,20 @@ void OVERLAY_edit_gpencil_cache_init(OVERLAY_Data *vedata)
DRWState state = DRW_STATE_WRITE_COLOR;
DRW_PASS_CREATE(psl->edit_gpencil_curve_ps, state | pd->clipping_state);
- sh = OVERLAY_shader_edit_curve_handle();
- pd->edit_gpencil_curve_handle_grp = grp = DRW_shgroup_create(sh, psl->edit_gpencil_curve_ps);
- DRW_shgroup_uniform_block(grp, "globalsBlock", G_draw.block_ubo);
- DRW_shgroup_uniform_bool_copy(grp, "showCurveHandles", pd->edit_curve.show_handles);
- DRW_shgroup_uniform_int_copy(grp, "curveHandleDisplay", pd->edit_curve.handle_display);
- DRW_shgroup_state_enable(grp, DRW_STATE_BLEND_ALPHA);
+ if (show_points && !hide_select) {
+ sh = OVERLAY_shader_edit_curve_handle();
+ pd->edit_gpencil_curve_handle_grp = grp = DRW_shgroup_create(sh, psl->edit_gpencil_curve_ps);
+ DRW_shgroup_uniform_block(grp, "globalsBlock", G_draw.block_ubo);
+ DRW_shgroup_uniform_bool_copy(grp, "showCurveHandles", pd->edit_curve.show_handles);
+ DRW_shgroup_uniform_int_copy(grp, "curveHandleDisplay", pd->edit_curve.handle_display);
+ DRW_shgroup_state_enable(grp, DRW_STATE_BLEND_ALPHA);
- sh = OVERLAY_shader_edit_curve_point();
- pd->edit_gpencil_curve_points_grp = grp = DRW_shgroup_create(sh, psl->edit_gpencil_curve_ps);
- DRW_shgroup_uniform_block(grp, "globalsBlock", G_draw.block_ubo);
- DRW_shgroup_uniform_bool_copy(grp, "showCurveHandles", pd->edit_curve.show_handles);
- DRW_shgroup_uniform_int_copy(grp, "curveHandleDisplay", pd->edit_curve.handle_display);
+ sh = OVERLAY_shader_edit_curve_point();
+ pd->edit_gpencil_curve_points_grp = grp = DRW_shgroup_create(sh, psl->edit_gpencil_curve_ps);
+ DRW_shgroup_uniform_block(grp, "globalsBlock", G_draw.block_ubo);
+ DRW_shgroup_uniform_bool_copy(grp, "showCurveHandles", pd->edit_curve.show_handles);
+ DRW_shgroup_uniform_int_copy(grp, "curveHandleDisplay", pd->edit_curve.handle_display);
+ }
}
/* control points for primitives and speed guide */
More information about the Bf-blender-cvs
mailing list