Merge branch 'blender-v4.1-release'

This commit is contained in:
Philipp Oeser 2024-03-15 15:12:22 +01:00
commit 16015ae507

View file

@ -868,7 +868,7 @@ void ED_region_image_metadata_draw(
uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
GPU_blend(GPU_BLEND_ALPHA);
immUniformThemeColor(TH_METADATA_BG);
immUniformThemeColorAlpha(TH_METADATA_BG, 1.0f);
immRectf(pos, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
immUnbindProgram();
@ -895,7 +895,7 @@ void ED_region_image_metadata_draw(
uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
GPU_blend(GPU_BLEND_ALPHA);
immUniformThemeColor(TH_METADATA_BG);
immUniformThemeColorAlpha(TH_METADATA_BG, 1.0f);
immRectf(pos, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
immUnbindProgram();