[Bf-blender-cvs] [1e5f65c91bf] soc-2020-greasepencil-curve: GPencil: Fix handle lines display
Falk David
noreply at git.blender.org
Fri Aug 21 11:56:27 CEST 2020
Commit: 1e5f65c91bf797d980b909425df4f732d8e28bb3
Author: Falk David
Date: Fri Aug 21 11:56:09 2020 +0200
Branches: soc-2020-greasepencil-curve
https://developer.blender.org/rB1e5f65c91bf797d980b909425df4f732d8e28bb3
GPencil: Fix handle lines display
===================================================================
M source/blender/draw/engines/overlay/shaders/edit_curve_handle_geom.glsl
===================================================================
diff --git a/source/blender/draw/engines/overlay/shaders/edit_curve_handle_geom.glsl b/source/blender/draw/engines/overlay/shaders/edit_curve_handle_geom.glsl
index 9311542a79e..442f69aec7e 100644
--- a/source/blender/draw/engines/overlay/shaders/edit_curve_handle_geom.glsl
+++ b/source/blender/draw/engines/overlay/shaders/edit_curve_handle_geom.glsl
@@ -53,6 +53,9 @@ void main()
bool edge_selected = (((vertFlag[1] | vertFlag[0]) & VERT_SELECTED) != 0);
bool handle_selected = (showCurveHandles &&
(((vertFlag[1] | vertFlag[0]) & VERT_SELECTED_BEZT_HANDLE) != 0));
+ /* It reuses freestyle flag because the flag is 8 bits and all are already used and this
+ * flag is not used in this context. */
+ bool is_gpencil = ((vertFlag[1] & EDGE_FREESTYLE) != 0);
/* If handle type is only selected and the edge is not selected, don't show. */
if ((curveHandleDisplay != CURVE_HANDLE_ALL) && (!handle_selected)) {
@@ -61,6 +64,9 @@ void main()
if ((!is_u_segment) && (color_id <= 4)) {
return;
}
+ if (is_gpencil) {
+ return;
+ }
}
vec4 inner_color;
More information about the Bf-blender-cvs
mailing list