Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-06-15 08:28:51 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-06-15 08:33:42 +0300
commitbf8b62e874877b4bbe32c19b84bdc937320176ea (patch)
tree5b059aa1a7bbe43213e8562c0f6c197271893460 /source/blender/draw/engines/overlay/shaders/edit_curve_handle_geom.glsl
parent24d77e7db727c938e374655eec702a8162decf67 (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/shaders/edit_curve_handle_geom.glsl')
-rw-r--r--source/blender/draw/engines/overlay/shaders/edit_curve_handle_geom.glsl2
1 files changed, 1 insertions, 1 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)) {