archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T70320: View clipping doesn't hide extra wireframe

Browse Source
This commit is contained in:
Campbell Barton
2019-09-30 04:45:39 +10:00
parent 3a3e5fb365
commit 56fe8239ab
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/draw/modes/overlay_mode.c
View File

@@ -239,11 +239,6 @@ static void overlay_cache_init(void *vedata)
geometry_shader_uniforms(g_data->face_wires_shgrp); geometry_shader_uniforms(g_data->face_wires_shgrp);
geometry_shader_uniforms(g_data->face_wires_xray_shgrp); geometry_shader_uniforms(g_data->face_wires_xray_shgrp);
} }
if (rv3d->rflag & RV3D_CLIPPING) {
DRW_shgroup_state_enable(g_data->face_wires_shgrp, DRW_STATE_CLIP_PLANES);
DRW_shgroup_state_enable(g_data->face_wires_xray_shgrp, DRW_STATE_CLIP_PLANES);
}
g_data->wire_step_param = stl->g_data->overlay.wireframe_threshold - 254.0f / 255.0f; g_data->wire_step_param = stl->g_data->overlay.wireframe_threshold - 254.0f / 255.0f;
} }
} }
@@ -414,6 +409,10 @@ static void overlay_cache_populate(void *vedata, Object *ob)
shgrp = DRW_shgroup_create_sub(pd->face_wires_shgrp); shgrp = DRW_shgroup_create_sub(pd->face_wires_shgrp);
} }
if (draw_ctx->rv3d->rflag & RV3D_CLIPPING) {
DRW_shgroup_state_enable(shgrp, DRW_STATE_CLIP_PLANES);
}
float wire_step_param = 10.0f; float wire_step_param = 10.0f;
if (!use_sculpt_pbvh) { if (!use_sculpt_pbvh) {
wire_step_param = (all_wires) ? 1.0f : pd->wire_step_param; wire_step_param = (all_wires) ? 1.0f : pd->wire_step_param;