diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2016-09-28 21:48:51 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2016-09-28 21:48:51 +0300 |
| commit | 4c7ff8fb1e3c59439cdd8181b10f6b6dfc478033 (patch) | |
| tree | bab137dbbf8027d63328312f9ea3ba1853ddeab3 /source/blender/windowmanager | |
| parent | 83d5a919e26affaa4e81258e629fe048215f6a04 (diff) | |
Fix animation transition in region overlay not working since 4a1feaa5
We still have stills with the User Preference window, though.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_draw.c | 1 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_stereo.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index 4303ce30d9e..e9eaa5677e4 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -455,6 +455,7 @@ void wm_triple_draw_textures(wmWindow *win, wmDrawTriple *triple, float alpha) glBindTexture(triple->target, triple->bind); + immUniform1f("alpha", alpha); immUniform1i("texture_map", 0); immBegin(GL_QUADS, 4); diff --git a/source/blender/windowmanager/intern/wm_stereo.c b/source/blender/windowmanager/intern/wm_stereo.c index ea9a09d1a34..e2b6df65ce8 100644 --- a/source/blender/windowmanager/intern/wm_stereo.c +++ b/source/blender/windowmanager/intern/wm_stereo.c @@ -282,6 +282,7 @@ static void wm_method_draw_stereo3d_topbottom(wmWindow *win) glBindTexture(triple->target, triple->bind); + immUniform1f("alpha", 1.0f); immUniform1i("texture_map", 0); immBegin(GL_QUADS, 4); |