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

Overlay: face orientation

Browse Source 
- fixed the blending with solid drawtype
This commit is contained in:
Jeroen Bakker
2018-04-22 12:58:11 +02:00
parent 1de7a0c0dc
commit b8e7991811
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,16 +94,8 @@ static void overlay_cache_init(void *vedata)
}
View3D *v3d = DCS->v3d;
int bm_face_orientation = DRW_STATE_ADDITIVE;
if (v3d) {
stl->g_data->overlays = v3d->overlays;
/*
Solid flat/studio lighting gives strange results when blending with the defaults.
*/
if (v3d->drawtype == OB_SOLID) {
bm_face_orientation = DRW_STATE_BLEND;
}
}
else {
stl->g_data->overlays = 0;
@@ -111,7 +103,7 @@ static void overlay_cache_init(void *vedata)
/* Face Orientation Pass */
if (stl->g_data->overlays & V3D_OVERLAY_FACE_ORIENTATION) {
int state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL | bm_face_orientation;
int state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL | DRW_STATE_BLEND;
psl->face_orientation_pass = DRW_pass_create("Face Orientation", state);
stl->g_data->face_orientation_shgrp = DRW_shgroup_create(e_data.face_orientation_sh, psl->face_orientation_pass);
}

2
source/blender/draw/modes/shaders/overlay_face_orientation_frag.glsl
View File

@@ -6,5 +6,5 @@ out vec4 fragColor;
void main()
{
fragColor = vec4(gl_FrontFacing ? color_towards: color_outwards, 1.0);
fragColor = vec4(gl_FrontFacing ? color_towards: color_outwards, 0.7);
}