1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/draw/engines/overlay/shaders/edit_curve_point_vert.glsl b/source/blender/draw/engines/overlay/shaders/edit_curve_point_vert.glsl
index 6fa4576ae71..b1e1c0879a5 100644
--- a/source/blender/draw/engines/overlay/shaders/edit_curve_point_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/edit_curve_point_vert.glsl
@@ -2,7 +2,11 @@
 /* Keep the same value of `BEZIER_HANDLE` in `draw_cache_imp_curve.c` */
 #define BEZIER_HANDLE 1 << 3
 
+/* Keep the same value in `handle_display` in `DNA_view3d_types.h` */
+#define CURVE_HANDLE_SELECTED 0
+
 uniform bool showCurveHandles;
+uniform int curveHandleDisplay;
 
 in vec3 pos;
 in int data;
@@ -32,7 +36,12 @@ void main()
   world_clip_planes_calc_clip_distance(world_pos);
 #endif
 
-  if (!showCurveHandles && ((data & BEZIER_HANDLE) != 0)) {
+  bool show_handle = showCurveHandles;
+  if ((curveHandleDisplay == CURVE_HANDLE_SELECTED) && ((data & HANDLE_SELECTED) == 0)) {
+    show_handle = false;
+  }
+
+  if (!show_handle && ((data & BEZIER_HANDLE) != 0)) {
     /* We set the vertex at the camera origin to generate 0 fragments. */
     gl_Position = vec4(0.0, 0.0, -3e36, 0.0);
   }