diff options
| author | Bastien Montagne <bastien@blender.org> | 2021-11-05 17:06:10 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2021-11-05 17:06:10 +0300 |
| commit | a0f50c18900ed366a825457c553d2d6e383c1483 (patch) | |
| tree | 0e77c6e98901bd0fbcf220af346a8039f68781f0 /source/blender/editors | |
| parent | 4e09fd76bcabb602f1bd31c2bbd5dd2b09e4b64a (diff) | |
| parent | da9785965611762f9922231eed9bc3c170cb2b9f (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_clip/clip_draw.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c index 471b4a4bf5b..4bccb3664da 100644 --- a/source/blender/editors/space_clip/clip_draw.c +++ b/source/blender/editors/space_clip/clip_draw.c @@ -1219,10 +1219,11 @@ static void draw_plane_marker_image(Scene *scene, uint texCoord = GPU_vertformat_attr_add( imm_format, "texCoord", GPU_COMP_F32, 2, GPU_FETCH_FLOAT); - immBindBuiltinProgram(GPU_SHADER_2D_IMAGE_COLOR); + /* Use 3D image for correct display of planar tracked images. */ + immBindBuiltinProgram(GPU_SHADER_3D_IMAGE_MODULATE_ALPHA); immBindTexture("image", texture); - immUniformColor4f(1.0f, 1.0f, 1.0f, plane_track->image_opacity); + immUniform1f("alpha", plane_track->image_opacity); immBegin(GPU_PRIM_TRI_FAN, 4); |