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/intern/shaders | |
| 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/intern/shaders')
| -rw-r--r-- | source/blender/draw/intern/shaders/common_globals_lib.glsl | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/draw/intern/shaders/common_globals_lib.glsl b/source/blender/draw/intern/shaders/common_globals_lib.glsl index a479a87e14b..40a527a6ba4 100644 --- a/source/blender/draw/intern/shaders/common_globals_lib.glsl +++ b/source/blender/draw/intern/shaders/common_globals_lib.glsl @@ -123,6 +123,8 @@ layout(std140) uniform globalsBlock #define sizeViewportInv (sizeViewport.zw) +/* See: 'draw_cache_impl.h' for matching includes. */ + /* data[0] (1st byte flags) */ #define FACE_ACTIVE (1 << 0) #define FACE_SELECTED (1 << 1) @@ -135,9 +137,9 @@ layout(std140) uniform globalsBlock /* data[1] (2st byte flags) */ #define VERT_ACTIVE (1 << 0) #define VERT_SELECTED (1 << 1) -#define EDGE_ACTIVE (1 << 2) -#define EDGE_SELECTED (1 << 3) -#define EDGE_SEAM (1 << 4) -#define EDGE_SHARP (1 << 5) -#define EDGE_FREESTYLE (1 << 6) -#define HANDLE_SELECTED (1 << 7) +#define VERT_SELECTED_BEZT_HANDLE (1 << 2) +#define EDGE_ACTIVE (1 << 3) +#define EDGE_SELECTED (1 << 4) +#define EDGE_SEAM (1 << 5) +#define EDGE_SHARP (1 << 6) +#define EDGE_FREESTYLE (1 << 7) |