diff options
| author | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-11-19 21:34:44 +0300 |
|---|---|---|
| committer | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-11-19 21:34:44 +0300 |
| commit | 99a2af76d10e05a18987be5d554ada197b1ca086 (patch) | |
| tree | 9f9ceccccbd117c05a701b6769eb69055be6a28e /source/blender/editors/space_clip/clip_draw.c | |
| parent | 139606bd370f96e0a8685547d515a2335591d5de (diff) | |
| parent | 50ad0e15fe0adde7335c89c6fcfa0948c341a08a (diff) | |
Merge branch 'master' into soc-2021-uv-edge-select-support
Diffstat (limited to 'source/blender/editors/space_clip/clip_draw.c')
| -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); |