Commit: 8c4965f86d67b10f1b9b5b8d6ca29cb2c233d529 Author: Philipp Oeser Date: Tue May 19 15:14:05 2020 +0200 Branches: blender-v2.83-release https://developer.blender.org/rB8c4965f86d67b10f1b9b5b8d6ca29cb2c233d529
Fix build error after 30cbbccc6002 That part only applies to master, sorry for the noise =================================================================== M source/blender/editors/uvedit/uvedit_draw.c =================================================================== diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index 74f58589f11..28800c5b6cf 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -223,7 +223,6 @@ static void draw_uvs_shadow(SpaceImage *sima, { Object *ob_eval = DEG_get_evaluated_object(depsgraph, obedit); Mesh *me = ob_eval->data; - const float overlay_alpha = sima->uv_opacity; float col[4]; UI_GetThemeColor4fv(TH_UV_SHADOW, col); @@ -236,11 +235,7 @@ static void draw_uvs_shadow(SpaceImage *sima, 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_uniform_4fv(edges, "color", col); GPU_batch_draw(edges); @@ -249,9 +244,6 @@ static void draw_uvs_shadow(SpaceImage *sima, GPU_line_smooth(false); GPU_blend(false); } - else if (overlay_alpha < 1.0f) { - GPU_blend(false); - } } } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs