diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-09-26 18:19:03 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-09-26 18:19:03 +0300 |
commit | 8cff9c20fff954cb0aa725c15c064c3aecf322b5 (patch) | |
tree | 99bd6e859bcfbe56f555bfe2d1e4eae374fdf1c3 /source/blender/windowmanager | |
parent | 628ef78e8a9db7ba37cfc1bbb6b2d4ac0dbecab3 (diff) | |
parent | b23ffded0866b5b24cb50fca669efde4ec1e3ffd (diff) |
Merge branch 'master' into blender2.8
WARNING! Full build is broken, alembic has not been merged in correctly and has some references to particle stuff.
Don't have time to tackle this now (and probably would be better if someone knowing what he's doing does it anyway).
Conflicts:
release/scripts/startup/bl_ui/properties_particle.py
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/smoke.c
source/blender/editors/physics/particle_object.c
source/blender/editors/physics/physics_intern.h
source/blender/editors/physics/physics_ops.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/editors/space_view3d/drawvolume.c
source/blender/makesrna/intern/rna_smoke.c
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_stereo.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/source/blender/windowmanager/intern/wm_stereo.c b/source/blender/windowmanager/intern/wm_stereo.c index 5576a104123..1c1c2ad35af 100644 --- a/source/blender/windowmanager/intern/wm_stereo.c +++ b/source/blender/windowmanager/intern/wm_stereo.c @@ -168,7 +168,6 @@ static void wm_method_draw_stereo3d_sidebyside(wmWindow *win) wmDrawData *drawdata; wmDrawTriple *triple; float halfx, halfy, ratiox, ratioy; - float alpha = 1.0f; int view; int soffx; bool cross_eyed = (win->stereo3d_format->flag & S3D_SIDEBYSIDE_CROSSEYED) != 0; @@ -187,8 +186,6 @@ static void wm_method_draw_stereo3d_sidebyside(wmWindow *win) soffx = 0; } - glEnable(triple->target); - const int sizex = triple->x; const int sizey = triple->y; @@ -206,9 +203,10 @@ static void wm_method_draw_stereo3d_sidebyside(wmWindow *win) halfy /= triple->y; } + glEnable(triple->target); glBindTexture(triple->target, triple->bind); - glColor4f(1.0f, 1.0f, 1.0f, alpha); + glColor4f(1.0f, 1.0f, 1.0f, 1.0f); glBegin(GL_QUADS); glTexCoord2f(halfx, halfy); glVertex2f(soffx, 0); @@ -225,7 +223,6 @@ static void wm_method_draw_stereo3d_sidebyside(wmWindow *win) glBindTexture(triple->target, 0); glDisable(triple->target); - glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); } } @@ -234,7 +231,6 @@ static void wm_method_draw_stereo3d_topbottom(wmWindow *win) wmDrawData *drawdata; wmDrawTriple *triple; float halfx, halfy, ratiox, ratioy; - float alpha = 1.0f; int view; int soffy; @@ -249,8 +245,6 @@ static void wm_method_draw_stereo3d_topbottom(wmWindow *win) soffy = 0; } - glEnable(triple->target); - const int sizex = triple->x; const int sizey = triple->y; @@ -268,9 +262,10 @@ static void wm_method_draw_stereo3d_topbottom(wmWindow *win) halfy /= triple->y; } + glEnable(triple->target); glBindTexture(triple->target, triple->bind); - glColor4f(1.0f, 1.0f, 1.0f, alpha); + glColor4f(1.0f, 1.0f, 1.0f, 1.0f); glBegin(GL_QUADS); glTexCoord2f(halfx, halfy); glVertex2f(0, soffy); @@ -287,7 +282,6 @@ static void wm_method_draw_stereo3d_topbottom(wmWindow *win) glBindTexture(triple->target, 0); glDisable(triple->target); - glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); } } |