[Bf-blender-cvs] [fb17a3f] master: Multi-View: Time Sequencial (aka pageflip, aka quadbuffer) stereo support

[Dalai Felinto]

Commit: fb17a3fb765cf4d4eccb90bd2468dab930071792
Author: Dalai Felinto
Date:   Fri Apr 24 11:58:03 2015 -0300
Branches: master
https://developer.blender.org/rBfb17a3fb765cf4d4eccb90bd2468dab930071792

Multi-View: Time Sequencial (aka pageflip, aka quadbuffer) stereo support

TODO: I would be nicer if we could set win at file opening to the
current open window, but I'll implement this later.

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

M	source/blender/blenloader/intern/readfile.c
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 9dcb872..060b5e9 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5819,6 +5819,12 @@ static void direct_link_windowmanager(FileData *fd, wmWindowManager *wm)
 		win->lastcursor  = 0;
 		win->modalcursor = 0;
 		win->stereo3d_format = newdataadr(fd, win->stereo3d_format);
+
+		/* multiview always fallback to anaglyph at file opening
+		 * otherwise quadbuffer saved files can break Blender */
+		if (win->stereo3d_format) {
+			win->stereo3d_format->display_mode = S3D_DISPLAY_ANAGLYPH;
+		}
 	}
 	
 	BLI_listbase_clear(&wm->timers);
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index a47a777..f67af39 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -373,10 +373,8 @@ EnumPropertyItem stereo3d_display_items[] = {
      "(anaglyph glasses are required)"},
 	{S3D_DISPLAY_INTERLACE, "INTERLACE", 0, "Interlace",
      "Render views for left and right eyes interlaced in a single image (3D-ready monitor is required)"},
-#ifdef DEBUG /* MULTIVIEW_TODO: quadbuffer mode not fully working */
 	{S3D_DISPLAY_PAGEFLIP, "TIMESEQUENTIAL", 0, "Time Sequential",
      "Render alternate eyes (also known as page flip, quad buffer support in the graphic card is required)"},
-#endif
 	{S3D_DISPLAY_SIDEBYSIDE, "SIDEBYSIDE", 0, "Side-by-Side", "Render views for left and right eyes side-by-side"},
 	{S3D_DISPLAY_TOPBOTTOM, "TOPBOTTOM", 0, "Top-Bottom", "Render views for left and right eyes one above another"},
 	{0, NULL, 0, NULL, NULL}