[Bf-blender-cvs] [d3b915c] multiview: From review: use GL_TRUE/GL_FALSE whenever possible
Dalai Felinto
noreply at git.blender.org
Tue Mar 31 18:51:05 CEST 2015
Commit: d3b915c27311b4e304acc4a25f5c276a08bac728
Author: Dalai Felinto
Date: Tue Mar 31 13:43:35 2015 -0300
Branches: multiview
https://developer.blender.org/rBd3b915c27311b4e304acc4a25f5c276a08bac728
>From review: use GL_TRUE/GL_FALSE whenever possible
===================================================================
M source/blender/windowmanager/intern/wm_stereo.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_stereo.c b/source/blender/windowmanager/intern/wm_stereo.c
index fbf2f62..a1bc5d5 100644
--- a/source/blender/windowmanager/intern/wm_stereo.c
+++ b/source/blender/windowmanager/intern/wm_stereo.c
@@ -165,19 +165,28 @@ static void wm_method_draw_stereo_anaglyph(wmWindow *win)
bit = view + 1;
switch (win->stereo3d_format->anaglyph_type) {
case S3D_ANAGLYPH_REDCYAN:
- glColorMask(1&bit, 2&bit, 2&bit, false);
+ glColorMask((1&bit) ? GL_TRUE : GL_FALSE,
+ (2&bit) ? GL_TRUE : GL_FALSE,
+ (2&bit) ? GL_TRUE : GL_FALSE,
+ GL_FALSE);
break;
case S3D_ANAGLYPH_GREENMAGENTA:
- glColorMask(2&bit, 1&bit, 2&bit, false);
+ glColorMask((2&bit) ? GL_TRUE : GL_FALSE,
+ (1&bit) ? GL_TRUE : GL_FALSE,
+ (2&bit) ? GL_TRUE : GL_FALSE,
+ GL_FALSE);
break;
case S3D_ANAGLYPH_YELLOWBLUE:
- glColorMask(1&bit, 1&bit, 2&bit, false);
+ glColorMask((1&bit) ? GL_TRUE : GL_FALSE,
+ (1&bit) ? GL_TRUE : GL_FALSE,
+ (2&bit) ? GL_TRUE : GL_FALSE,
+ GL_FALSE);
break;
}
wm_triple_draw_textures(win, drawdata->triple, 1.0f);
- glColorMask(true, true, true, true);
+ glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
}
}
@@ -248,7 +257,7 @@ static void wm_method_draw_stereo_sidebyside(wmWindow *win)
glBindTexture(triple->target, 0);
glDisable(triple->target);
- glColorMask(true, true, true, true);
+ glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
}
}
@@ -315,7 +324,7 @@ static void wm_method_draw_stereo_topbottom(wmWindow *win)
glBindTexture(triple->target, 0);
glDisable(triple->target);
- glColorMask(true, true, true, true);
+ glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
}
}
More information about the Bf-blender-cvs
mailing list