Commit: 606e290500c2954acb2d9455c8242b66d23c0c79
Author: Campbell Barton
Date: Tue Mar 17 15:59:58 2015 +1100
Branches: multiview
https://developer.blender.org/rB606e290500c2954acb2d9455c8242b66d23c0c79
Correct bool/flag use
===================================================================
M source/blender/blenkernel/intern/scene.c
M source/blender/imbuf/intern/stereoimbuf.c
M source/blender/windowmanager/intern/wm_stereo.c
===================================================================
diff --git a/source/blender/blenkernel/intern/scene.c
b/source/blender/blenkernel/intern/scene.c
index cbb02ca..4fcb06c 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -2367,7 +2367,7 @@ void BKE_scene_multiview_videos_dimensions_get(
{
IMB_stereo_write_dimensions(
rd->im_format.stereo3d_format.display_mode,
- (rd->im_format.stereo3d_format.flag &
S3D_SQUEEZED_FRAME),
+ (rd->im_format.stereo3d_format.flag &
S3D_SQUEEZED_FRAME) != 0,
width, height,
r_width, r_height);
}
diff --git a/source/blender/imbuf/intern/stereoimbuf.c
b/source/blender/imbuf/intern/stereoimbuf.c
index 11142c8..d263ecf 100644
--- a/source/blender/imbuf/intern/stereoimbuf.c
+++ b/source/blender/imbuf/intern/stereoimbuf.c
@@ -751,10 +751,10 @@ static void imb_stereo_write_doit(Stereo3DData *s3d_data,
Stereo3dFormat *s3d)
case S3D_DISPLAY_BLURAY:
break;
case S3D_DISPLAY_INTERLACE:
- imb_stereo_write_interlace(s3d_data,
s3d->interlace_type, (s3d->flag & S3D_INTERLACE_SWAP));
+ imb_stereo_write_interlace(s3d_data,
s3d->interlace_type, (s3d->flag & S3D_INTERLACE_SWAP) != 0);
break;
case S3D_DISPLAY_SIDEBYSIDE:
- imb_stereo_write_sidebyside(s3d_data, (s3d->flag &
S3D_SIDEBYSIDE_CROSSEYED));
+ imb_stereo_write_sidebyside(s3d_data, (s3d->flag &
S3D_SIDEBYSIDE_CROSSEYED) != 0);
break;
case S3D_DISPLAY_TOPBOTTOM:
imb_stereo_write_topbottom(s3d_data);
@@ -1291,10 +1291,10 @@ static void imb_stereo_read_doit(Stereo3DData
*s3d_data, Stereo3dFormat *s3d)
case S3D_DISPLAY_BLURAY:
break;
case S3D_DISPLAY_INTERLACE:
- imb_stereo_read_interlace(s3d_data,
s3d->interlace_type, (s3d->flag & S3D_INTERLACE_SWAP));
+ imb_stereo_read_interlace(s3d_data,
s3d->interlace_type, (s3d->flag & S3D_INTERLACE_SWAP) != 0);
break;
case S3D_DISPLAY_SIDEBYSIDE:
- imb_stereo_read_sidebyside(s3d_data, (s3d->flag &
S3D_SIDEBYSIDE_CROSSEYED));
+ imb_stereo_read_sidebyside(s3d_data, (s3d->flag &
S3D_SIDEBYSIDE_CROSSEYED) != 0);
break;
case S3D_DISPLAY_TOPBOTTOM:
imb_stereo_read_topbottom(s3d_data);
diff --git a/source/blender/windowmanager/intern/wm_stereo.c
b/source/blender/windowmanager/intern/wm_stereo.c
index 6720287..23f1074 100644
--- a/source/blender/windowmanager/intern/wm_stereo.c
+++ b/source/blender/windowmanager/intern/wm_stereo.c
@@ -105,7 +105,7 @@ static void wm_interlace_create_masks(wmWindow *win)
{
GLuint pattern;
char i;
- bool swap = (win->stereo3d_format->flag & S3D_INTERLACE_SWAP);
+ bool swap = (win->stereo3d_format->flag & S3D_INTERLACE_SWAP) != 0;
enum eStereo3dInterlaceType interlace_type =
win->stereo3d_format->interlace_type;
if (interlace_prev_type == interlace_type && interlace_prev_swap ==
swap)
@@ -204,7 +204,7 @@ static void wm_method_draw_stereo_sidebyside(wmWindow *win)
float alpha = 1.0f;
int view;
int soffx;
- bool cross_eyed = (win->stereo3d_format->flag &
S3D_SIDEBYSIDE_CROSSEYED);
+ bool cross_eyed = (win->stereo3d_format->flag &
S3D_SIDEBYSIDE_CROSSEYED) != 0;
for (view = 0; view < 2; view ++) {
drawdata = BLI_findlink(&win->drawdata, (view * 2) + 1);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
