[Bf-blender-cvs] [bf72d65] multiview: Change S3D_UNSQUEEZED to SQUEEZED to make unsqueezed the default
Dalai Felinto
noreply at git.blender.org
Wed Sep 17 14:12:35 CEST 2014
Commit: bf72d65607cabfae980dd15bcc11d3435a999eef
Author: Dalai Felinto
Date: Tue Sep 16 11:17:29 2014 +0200
Branches: multiview
https://developer.blender.org/rBbf72d65607cabfae980dd15bcc11d3435a999eef
Change S3D_UNSQUEEZED to SQUEEZED to make unsqueezed the default
===================================================================
M source/blender/blenkernel/intern/scene.c
M source/blender/imbuf/intern/stereoimbuf.c
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_scene.c
M source/blender/render/intern/source/render_result.c
===================================================================
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 60c0b6c..a6816c3 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -2222,7 +2222,7 @@ void BKE_scene_videos_dimensions(const RenderData *rd, const size_t width, const
if ((rd->scemode & R_MULTIVIEW) &&
rd->im_format.views_format == R_IMF_VIEWS_STEREO_3D)
{
- IMB_stereo_write_dimensions(rd->im_format.stereo3d_format.display_mode, ((rd->im_format.stereo3d_format.flag & S3D_UNSQUEEZED_FRAME) == 0), width, height, r_width, r_height);
+ IMB_stereo_write_dimensions(rd->im_format.stereo3d_format.display_mode, (rd->im_format.stereo3d_format.flag & S3D_SQUEEZED_FRAME), width, height, r_width, r_height);
}
else {
*r_width = width;
diff --git a/source/blender/imbuf/intern/stereoimbuf.c b/source/blender/imbuf/intern/stereoimbuf.c
index a8406af..3efc967 100644
--- a/source/blender/imbuf/intern/stereoimbuf.c
+++ b/source/blender/imbuf/intern/stereoimbuf.c
@@ -588,7 +588,7 @@ static void imb_stereo_squeeze_ImBuf(ImBuf *ibuf, Stereo3dFormat *s3d, const siz
if (ELEM(s3d->display_mode, S3D_DISPLAY_SIDEBYSIDE, S3D_DISPLAY_TOPBOTTOM) == false)
return;
- if ((s3d->flag & S3D_UNSQUEEZED_FRAME))
+ if ((s3d->flag & S3D_SQUEEZED_FRAME) == 0)
return;
IMB_scaleImBuf_threaded(ibuf, x, y);
@@ -599,7 +599,7 @@ static void imb_stereo_unsqueeze_ImBuf(ImBuf *ibuf, Stereo3dFormat *s3d, const s
if (ELEM(s3d->display_mode, S3D_DISPLAY_SIDEBYSIDE, S3D_DISPLAY_TOPBOTTOM) == false)
return;
- if ((s3d->flag & S3D_UNSQUEEZED_FRAME) != 0)
+ if ((s3d->flag & S3D_SQUEEZED_FRAME) == 0)
return;
IMB_scaleImBuf_threaded(ibuf, x, y);
@@ -613,7 +613,7 @@ static void imb_stereo_squeeze_rectf(float *rectf, Stereo3dFormat *s3d, const si
if (ELEM(s3d->display_mode, S3D_DISPLAY_SIDEBYSIDE, S3D_DISPLAY_TOPBOTTOM) == false)
return;
- if ((s3d->flag & S3D_UNSQUEEZED_FRAME))
+ if ((s3d->flag & S3D_SQUEEZED_FRAME) == 0)
return;
/* creates temporary imbuf to store the rectf */
@@ -638,7 +638,7 @@ static void imb_stereo_squeeze_rect(int *rect, Stereo3dFormat *s3d, const size_t
if (ELEM(s3d->display_mode, S3D_DISPLAY_SIDEBYSIDE, S3D_DISPLAY_TOPBOTTOM) == false)
return;
- if ((s3d->flag & S3D_UNSQUEEZED_FRAME))
+ if ((s3d->flag & S3D_SQUEEZED_FRAME) == 0)
return;
/* creates temporary imbuf to store the rectf */
@@ -1225,7 +1225,7 @@ void IMB_ImBufFromStereo(Stereo3dFormat *s3d, ImBuf **left, ImBuf **right)
stereo = *left;
- IMB_stereo_read_dimensions(s3d->display_mode, ((s3d->flag & S3D_UNSQUEEZED_FRAME) != 0), stereo->x, stereo->y, &width, &height);
+ IMB_stereo_read_dimensions(s3d->display_mode, ((s3d->flag & S3D_SQUEEZED_FRAME) == 0), stereo->x, stereo->y, &width, &height);
*left = IMB_allocImBuf(width, height, stereo->planes, (is_float ? IB_rectfloat : IB_rect));
*right = IMB_allocImBuf(width, height, stereo->planes, (is_float ? IB_rectfloat : IB_rect));
@@ -1235,7 +1235,7 @@ void IMB_ImBufFromStereo(Stereo3dFormat *s3d, ImBuf **left, ImBuf **right)
(*right)->flags = stereo->flags;
/* we always work with unsqueezed formats */
- IMB_stereo_write_dimensions(s3d->display_mode, ((s3d->flag & S3D_UNSQUEEZED_FRAME) != 0), stereo->x, stereo->y, &width, &height);
+ IMB_stereo_write_dimensions(s3d->display_mode, ((s3d->flag & S3D_SQUEEZED_FRAME) == 0), stereo->x, stereo->y, &width, &height);
imb_stereo_unsqueeze_ImBuf(stereo, s3d, width, height);
imb_stereo_data_initialize(&s3d_data, is_float, (*left)->x , (*left)->y, 4,
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index a300c04..c208bf8 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -300,7 +300,7 @@ typedef enum eStereoDisplayMode {
typedef enum eStereo3dFlag {
S3D_INTERLACE_SWAP = (1 << 0),
S3D_SIDEBYSIDE_CROSSEYED = (1 << 1),
- S3D_UNSQUEEZED_FRAME = (1 << 2),
+ S3D_SQUEEZED_FRAME = (1 << 2),
} eStereo3dFlag;
/* Stereo3dFormat.anaglyph_type */
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 9f3d3ca..58c8ba7 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -4176,7 +4176,7 @@ static void rna_def_image_format_stereo3d_format(BlenderRNA *brna)
RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY, "rna_Stereo3dFormat_update");
prop = RNA_def_property(srna, "use_squeezed_frame", PROP_BOOLEAN, PROP_BOOLEAN);
- RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", S3D_UNSQUEEZED_FRAME);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", S3D_SQUEEZED_FRAME);
RNA_def_property_ui_text(prop, "Squeezed Frame", "Combine both views in a squeezed image");
RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY, "rna_Stereo3dFormat_update");
}
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index 461600f..a69f63f 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -1060,7 +1060,7 @@ bool RE_WriteRenderResult(ReportList *reports, RenderResult *rr, const char *fil
rectf_stereo = MEM_mallocN(sizeof(float *) * ((totpasses / 2) + 1), "RenderResult stereo pairs");
IMB_exr_add_view(exrhandle, "");
- IMB_stereo_write_dimensions(imf->stereo3d_format.display_mode, ((imf->stereo3d_format.flag & S3D_UNSQUEEZED_FRAME) == 0), rr->rectx, rr->recty, &width, &height);
+ IMB_stereo_write_dimensions(imf->stereo3d_format.display_mode, (imf->stereo3d_format.flag & S3D_SQUEEZED_FRAME), rr->rectx, rr->recty, &width, &height);
for (i = 0; i < 2; i++) {
rv[i] = BLI_findstring(&rr->views, names[i], offsetof(RenderView, name));
More information about the Bf-blender-cvs
mailing list