diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-06-15 08:28:51 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-06-15 08:33:42 +0300 |
| commit | bf8b62e874877b4bbe32c19b84bdc937320176ea (patch) | |
| tree | 5b059aa1a7bbe43213e8562c0f6c197271893460 /source/blender/draw/engines/overlay | |
| parent | 24d77e7db727c938e374655eec702a8162decf67 (diff) | |
Fix curve handle color ID display
Regression in 49f59092e7c8c caused all handles to display using
the 'aligned' theme color.
Arrange flags to fix this, add assert to avoid this happening again.
Also rename flag so it's use is clearer.
Diffstat (limited to 'source/blender/draw/engines/overlay')
| -rw-r--r-- | source/blender/draw/engines/overlay/shaders/edit_curve_handle_geom.glsl | 2 | ||||
| -rw-r--r-- | source/blender/draw/engines/overlay/shaders/edit_curve_point_vert.glsl | 2 |
2 files changed, 2 insertions, 2 deletions
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 306fbb473ee..a400aadb052 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 @@ -52,7 +52,7 @@ void main() bool edge_selected = (((vertFlag[1] | vertFlag[0]) & VERT_SELECTED) != 0); bool handle_selected = (showCurveHandles && - (((vertFlag[1] | vertFlag[0]) & HANDLE_SELECTED) != 0)); + (((vertFlag[1] | vertFlag[0]) & VERT_SELECTED_BEZT_HANDLE) != 0)); /* If handle type is only selected and the edge is not selected, don't show. */ if ((curveHandleDisplay != CURVE_HANDLE_ALL) && (!handle_selected)) { 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 b1e1c0879a5..a811fcca0d4 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 @@ -37,7 +37,7 @@ void main() #endif bool show_handle = showCurveHandles; - if ((curveHandleDisplay == CURVE_HANDLE_SELECTED) && ((data & HANDLE_SELECTED) == 0)) { + if ((curveHandleDisplay == CURVE_HANDLE_SELECTED) && ((data & VERT_SELECTED_BEZT_HANDLE) == 0)) { show_handle = false; } |