griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: Overlay: Missing backface culling in facing overlay

Browse Source 
Same fix as for legacy overlay.

Fix #126351
This commit is contained in:
Clément Foucault
2024-08-23 17:10:34 +02:00
parent 0bad30317c
commit e5ba4cc7b0
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/draw/engines/overlay/overlay_next_facing.hh
View File

@@ -28,16 +28,21 @@ class Facing {
void begin_sync(Resources &res, const State &state)
{
enabled = state.overlay.flag & V3D_OVERLAY_FACE_ORIENTATION && !state.xray_enabled &&
selection_type_ == SelectionType::DISABLED;
enabled = state.v3d && (state.overlay.flag & V3D_OVERLAY_FACE_ORIENTATION) &&
!state.xray_enabled && (selection_type_ == SelectionType::DISABLED);
if (!enabled) {
/* Not used. But release the data. */
ps_.init();
return;
}
const View3DShading &shading = state.v3d->shading;
bool use_cull = ((shading.type == OB_SOLID) && (shading.flag & V3D_SHADING_BACKFACE_CULLING));
DRWState backface_cull_state = use_cull ? DRW_STATE_CULL_BACK : DRWState(0);
ps_.init();
ps_.state_set(DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_WRITE_DEPTH |
state.clipping_state);
state.clipping_state | backface_cull_state);
ps_.shader_set(res.shaders.facing.get());
ps_.bind_ubo("globalsBlock", &res.globals_buf);
}

8
source/blender/draw/engines/overlay/overlay_next_prepass.hh
View File

@@ -34,8 +34,14 @@ class Prepass {
ps_.init();
return;
}
const View3DShading &shading = state.v3d->shading;
bool use_cull = ((shading.type == OB_SOLID) && (shading.flag & V3D_SHADING_BACKFACE_CULLING));
DRWState backface_cull_state = use_cull ? DRW_STATE_CULL_BACK : DRWState(0);
ps_.init();
ps_.state_set(DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL | state.clipping_state);
ps_.state_set(DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL | state.clipping_state |
backface_cull_state);
ps_.shader_set(res.shaders.depth_mesh.get());
res.select_bind(ps_);
}