diff options
author | Pablo Vazquez <pablovazquez> | 2021-10-21 22:00:17 +0300 |
---|---|---|
committer | Pablo Vazquez <pablo@blender.org> | 2021-10-21 22:00:38 +0300 |
commit | 9b1b4b9e32c8ac86e460204bb93e0ddc42ad9e49 (patch) | |
tree | 564dd67518d0f5d504de2b30a871a46401f97720 /source/blender/editors/space_node/node_draw.cc | |
parent | 1d96a482675dd2ccad2af31c274f74b9f6603d6b (diff) |
Node Editor: Introduce color overlay and dashed wires theme setting
This patch includes code from D9891 and D12754, so credit goes to Juanfran and Dalai.
I updated the patches to work with `master` and with the new overlay toggle.
The reason to include both changes as part of one patch is that the dimmed dashed lines work much better together with colored wires.
Theme setting for dash opacity:
{F11370574, size=full}
{F11286177, size=full, autoplay, loop}
{F11149912, size=full}
For adding the overlay I used `SpaceImageOverlay` as reference, although I'm not familiar with this code so there might be mistakes.
Reviewed By: #user_interface, HooglyBoogly
Differential Revision: https://developer.blender.org/D12886
Diffstat (limited to 'source/blender/editors/space_node/node_draw.cc')
-rw-r--r-- | source/blender/editors/space_node/node_draw.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc index dca09a58c9a..97655080192 100644 --- a/source/blender/editors/space_node/node_draw.cc +++ b/source/blender/editors/space_node/node_draw.cc @@ -2299,7 +2299,7 @@ void node_draw_space(const bContext *C, ARegion *region) GPU_line_smooth(false); GPU_blend(GPU_BLEND_NONE); - if (snode->flag & SNODE_SHOW_GPENCIL) { + if (snode->overlay.flag & SN_OVERLAY_SHOW_OVERLAYS && snode->flag & SNODE_SHOW_GPENCIL) { /* Draw grease-pencil annotations. */ ED_annotation_draw_view2d(C, true); } @@ -2318,7 +2318,7 @@ void node_draw_space(const bContext *C, ARegion *region) UI_view2d_view_restore(C); if (snode->treepath.last) { - if (snode->flag & SNODE_SHOW_GPENCIL) { + if (snode->overlay.flag & SN_OVERLAY_SHOW_OVERLAYS && snode->flag & SNODE_SHOW_GPENCIL) { /* Draw grease-pencil (screen strokes, and also paint-buffer). */ ED_annotation_draw_view2d(C, false); } |