[Bf-blender-cvs] [ced7d8f] multiview: Remove never implemented BLURAY mode

[Dalai Felinto]

Commit: ced7d8fb79b8ad346a344c9fc5ff8d8a6657873a
Author: Dalai Felinto
Date:   Tue Mar 31 10:42:34 2015 -0300
Branches: multiview
https://developer.blender.org/rBced7d8fb79b8ad346a344c9fc5ff8d8a6657873a

Remove never implemented BLURAY mode

===================================================================

M	source/blender/imbuf/intern/stereoimbuf.c
M	source/blender/makesdna/DNA_scene_types.h
M	source/blender/makesrna/intern/rna_scene.c

===================================================================

diff --git a/source/blender/imbuf/intern/stereoimbuf.c b/source/blender/imbuf/intern/stereoimbuf.c
index 5183b68..a866b8e 100644
--- a/source/blender/imbuf/intern/stereoimbuf.c
+++ b/source/blender/imbuf/intern/stereoimbuf.c
@@ -524,11 +524,6 @@ void IMB_stereo_write_dimensions(
         size_t *r_width, size_t *r_height)
 {
 	switch (mode) {
-		case S3D_DISPLAY_BLURAY:
-		{
-			//TODO need to find the dimensions, forgot how big the black bar has to be
-			break;
-		}
 		case S3D_DISPLAY_SIDEBYSIDE:
 		{
 			*r_width = is_squeezed ? width : width * 2;
@@ -557,11 +552,6 @@ void IMB_stereo_read_dimensions(
         size_t *r_width, size_t *r_height)
 {
 	switch (mode) {
-		case S3D_DISPLAY_BLURAY:
-		{
-			//TODO need to find the dimensions, forgot how big the black bar has to be
-			break;
-		}
 		case S3D_DISPLAY_SIDEBYSIDE:
 		{
 			*r_width = is_squeezed ? width / 2 : width;
@@ -749,8 +739,6 @@ static void imb_stereo_write_doit(Stereo3DData *s3d_data, Stereo3dFormat *s3d)
 		case S3D_DISPLAY_ANAGLYPH:
 			imb_stereo_write_anaglyph(s3d_data, s3d->anaglyph_type);
 			break;
-		case S3D_DISPLAY_BLURAY:
-			break;
 		case S3D_DISPLAY_INTERLACE:
 			imb_stereo_write_interlace(s3d_data, s3d->interlace_type, (s3d->flag & S3D_INTERLACE_SWAP) != 0);
 			break;
@@ -1289,8 +1277,6 @@ static void imb_stereo_read_doit(Stereo3DData *s3d_data, Stereo3dFormat *s3d)
 		case S3D_DISPLAY_ANAGLYPH:
 			imb_stereo_read_anaglyph(s3d_data, s3d->anaglyph_type);
 			break;
-		case S3D_DISPLAY_BLURAY:
-			break;
 		case S3D_DISPLAY_INTERLACE:
 			imb_stereo_read_interlace(s3d_data, s3d->interlace_type, (s3d->flag & S3D_INTERLACE_SWAP) != 0);
 			break;
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 108b1c6..250bfe8 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -290,11 +290,10 @@ typedef struct Stereo3dFormat {
 /* Stereo3dFormat.display_mode */
 typedef enum eStereoDisplayMode {
 	S3D_DISPLAY_ANAGLYPH    = 0,
-	S3D_DISPLAY_BLURAY      = 1,
-	S3D_DISPLAY_INTERLACE   = 2,
-	S3D_DISPLAY_PAGEFLIP    = 3,
-	S3D_DISPLAY_SIDEBYSIDE  = 4,
-	S3D_DISPLAY_TOPBOTTOM   = 5,
+	S3D_DISPLAY_INTERLACE   = 1,
+	S3D_DISPLAY_PAGEFLIP    = 2,
+	S3D_DISPLAY_SIDEBYSIDE  = 3,
+	S3D_DISPLAY_TOPBOTTOM   = 4,
 } eStereoDisplayMode;
 
 /* Stereo3dFormat.flag */
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 7ed4611..907d010 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -4393,7 +4393,6 @@ static void rna_def_image_format_stereo3d_format(BlenderRNA *brna)
 		{S3D_DISPLAY_INTERLACE, "INTERLACE", 0, "Interlace", "Render two images for each eye into one interlaced image. 3D-ready monitor is requiered"},
 		{S3D_DISPLAY_SIDEBYSIDE, "SIDEBYSIDE", 0, "Side-by-Side", "Render images for left and right eye side-by-side"},
 		{S3D_DISPLAY_TOPBOTTOM, "TOPBOTTOM", 0, "Top-Bottom", "Render images for left and right eye one above another"},
-		{S3D_DISPLAY_BLURAY, "BLURAY", 0, "Blu-ray", ""},
 		{0, NULL, 0, NULL, NULL}
 	};