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

Fix #114571: Retopology Overlay Face Color Regression

Browse Source 
Fix #114571: Retopology Overlay Face Color Regression

Missed in dfd1b63cc7

Pull Request: https://projects.blender.org/blender/blender/pulls/114589
This commit is contained in:
Gilberto Rodrigues
2023-11-07 21:43:01 +01:00
committed by Germano Cavalcante
parent fd60a0be38
commit 3fddfb48be
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_common_lib.glsl
View File

@@ -55,9 +55,10 @@ vec4 EDIT_MESH_face_color(uint face_flag)
bool face_freestyle = (face_flag & FACE_FREESTYLE) != 0u;
bool face_selected = (face_flag & FACE_SELECTED) != 0u;
bool face_active = (face_flag & FACE_ACTIVE) != 0u;
bool face_retopo = (retopologyOffset > 0.0);
vec4 selected_face_col = (selectFace) ? colorFaceModeSelect : colorFaceSelect;
vec4 color = colorFace;
color = (retopologyOffset > 0.0) ? colorFaceRetopology : color;
color = face_retopo ? colorFaceRetopology : color;
color = face_freestyle ? colorFaceFreestyle : color;
color = face_selected ? selected_face_col : color;
if (selectFace && face_active) {
@@ -70,7 +71,7 @@ vec4 EDIT_MESH_face_color(uint face_flag)
}
else {
/* Don't always fill 'colorFace'. */
color.a = (selectFace || face_selected || face_active || face_freestyle) ? color.a : 0.0;
color.a = (selectFace || face_selected || face_active || face_freestyle || face_retopo) ? color.a : 0.0;
}
return color;
}