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

Fix (unreported) UV shadow not drawing smooth

Browse Source 
When showing UV edges after modifiers [draw_uvs_shadow], these were never
drawn anti-aliased [in contrast to the 'main' UVs].

Also: they did not respect the new 'UV Opacity' setting.

Differential Revision: https://developer.blender.org/D7764
This commit is contained in:
Philipp Oeser
2020-05-18 10:41:02 +02:00
parent 675ba2073d
commit 30cbbccc60
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/editors/uvedit/uvedit_draw.c
View File

@@ -216,13 +216,14 @@ static void uvedit_get_batches(Object *ob,
} }
} }
static void draw_uvs_shadow(SpaceImage *UNUSED(sima), static void draw_uvs_shadow(SpaceImage *sima,
const Scene *scene, const Scene *scene,
Object *obedit, Object *obedit,
Depsgraph *depsgraph) Depsgraph *depsgraph)
{ {
Object *ob_eval = DEG_get_evaluated_object(depsgraph, obedit); Object *ob_eval = DEG_get_evaluated_object(depsgraph, obedit);
Mesh *me = ob_eval->data; Mesh *me = ob_eval->data;
const float overlay_alpha = sima->uv_opacity;
float col[4]; float col[4];
UI_GetThemeColor4fv(TH_UV_SHADOW, col); UI_GetThemeColor4fv(TH_UV_SHADOW, col);
@@ -231,9 +232,26 @@ static void draw_uvs_shadow(SpaceImage *UNUSED(sima),
DRW_mesh_batch_cache_create_requested(ob_eval, me, scene, false, false); DRW_mesh_batch_cache_create_requested(ob_eval, me, scene, false, false);
if (edges) { if (edges) {
if (sima->flag & SI_SMOOTH_UV) {
GPU_line_smooth(true);
GPU_blend(true);
}
else if (overlay_alpha < 1.0f) {
GPU_blend(true);
}
col[3] = overlay_alpha;
GPU_batch_program_set_builtin(edges, GPU_SHADER_2D_UV_UNIFORM_COLOR); GPU_batch_program_set_builtin(edges, GPU_SHADER_2D_UV_UNIFORM_COLOR);
GPU_batch_uniform_4fv(edges, "color", col); GPU_batch_uniform_4fv(edges, "color", col);
GPU_batch_draw(edges); GPU_batch_draw(edges);
if (sima->flag & SI_SMOOTH_UV) {
GPU_line_smooth(false);
GPU_blend(false);
}
else if (overlay_alpha < 1.0f) {
GPU_blend(false);
}
} }
} }