diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-05-01 16:37:29 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-05-01 16:37:37 +0300 |
| commit | 1c992cc647d9954e43d06e10741692ad9d8af36d (patch) | |
| tree | 1d0b38d8c6d73f67914deb8b5c75ae9321ac4cb3 /source/blender/draw/engines/overlay/shaders | |
| parent | 0dfb6eddc001828058b84979699269a55c9bdfcb (diff) | |
Overlay: Fix non functional outline on wireframe
This was caused by rB6e5877c189df5d6c2dfcaa44ba4c3c9a8b387998.
Diffstat (limited to 'source/blender/draw/engines/overlay/shaders')
| -rw-r--r-- | source/blender/draw/engines/overlay/shaders/infos/outline_info.hh | 1 | ||||
| -rw-r--r-- | source/blender/draw/engines/overlay/shaders/outline_prepass_geom.glsl | 9 |
2 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/draw/engines/overlay/shaders/infos/outline_info.hh b/source/blender/draw/engines/overlay/shaders/infos/outline_info.hh index dbc08384680..21575747efa 100644 --- a/source/blender/draw/engines/overlay/shaders/infos/outline_info.hh +++ b/source/blender/draw/engines/overlay/shaders/infos/outline_info.hh @@ -37,6 +37,7 @@ GPU_SHADER_CREATE_INFO(overlay_outline_prepass_wire) .geometry_layout(PrimitiveIn::LINES_ADJACENCY, PrimitiveOut::LINE_STRIP, 2) .geometry_out(overlay_outline_prepass_iface) .vertex_source("outline_prepass_vert.glsl") + .geometry_source("outline_prepass_geom.glsl") .additional_info("draw_mesh", "overlay_outline_prepass") .additional_info("draw_object_infos"); diff --git a/source/blender/draw/engines/overlay/shaders/outline_prepass_geom.glsl b/source/blender/draw/engines/overlay/shaders/outline_prepass_geom.glsl index 0c7fafbf6b0..8a196620af9 100644 --- a/source/blender/draw/engines/overlay/shaders/outline_prepass_geom.glsl +++ b/source/blender/draw/engines/overlay/shaders/outline_prepass_geom.glsl @@ -2,18 +2,11 @@ #pragma BLENDER_REQUIRE(common_view_clipping_lib.glsl) #pragma BLENDER_REQUIRE(common_view_lib.glsl) -in vec3 vert[]; -.pos - - flat out uint objectId; - void vert_from_gl_in(int v) { gl_Position = gl_in[v].gl_Position; interp_out.ob_id = interp_in[v].ob_id; -#ifdef USE_WORLD_CLIP_PLANES - world_clip_planes_set_clip_distance(gl_in[v].gl_ClipDistance); -#endif + view_clipping_distances_set(gl_in[v]); } void main() |