[Bf-committers] opengl rendering

[Shaul Kedem]

Skipped content of type multipart/alternative-------------- next part --------------
Index: source/blender/makesdna/DNA_scene_types.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/makesdna/DNA_scene_types.h,v
retrieving revision 1.44
diff -u -b -B -r1.44 DNA_scene_types.h
--- source/blender/makesdna/DNA_scene_types.h	24 Aug 2005 20:37:25 -0000	1.44
+++ source/blender/makesdna/DNA_scene_types.h	30 Sep 2005 20:04:44 -0000
@@ -360,6 +360,7 @@
 /* yafray: renderer flag (not only exclusive to yafray) */
 #define R_INTERN	0
 #define R_YAFRAY	1
+#define R_OPENGL	2
 
 /* scemode */
 #define R_DOSEQ			0x0001
Index: source/blender/render/intern/source/initrender.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/render/intern/source/initrender.c,v
retrieving revision 1.64
diff -u -b -B -r1.64 initrender.c
--- source/blender/render/intern/source/initrender.c	25 Aug 2005 13:11:04 -0000	1.64
+++ source/blender/render/intern/source/initrender.c	30 Sep 2005 20:04:49 -0000
@@ -1182,6 +1182,11 @@
 	if (R.r.renderer==R_YAFRAY)
 		yafrayRender();
 	else
+	if (R.r.renderer==R_OPENGL) //sk
+		BIF_do_ogl_render(G.vd, 0);
+	else
 		mainRenderLoop();
 }
 
Index: source/blender/src/buttons_scene.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/buttons_scene.c,v
retrieving revision 1.90
diff -u -b -B -r1.90 buttons_scene.c
--- source/blender/src/buttons_scene.c	22 Sep 2005 19:47:31 -0000	1.90
+++ source/blender/src/buttons_scene.c	30 Sep 2005 20:04:53 -0000
@@ -1083,7 +1083,7 @@
 	uiBlockBeginAlign(block);
 	uiDefBut(block, BUT,B_DORENDER,"RENDER",	369, 164, 191,37, 0, 0, 0, 0, 0, "Start the rendering");
 	/* yafray: on request, render engine menu is back again, and moved to Render panel */
-	uiDefButS(block, MENU, B_SWITCHRENDER, "Rendering Engine %t|Blender Internal %x0|YafRay %x1", 
+	uiDefButS(block, MENU, B_SWITCHRENDER, "Rendering Engine %t|Blender Internal %x0|YafRay %x1|OpenGL Render %x2", 
 												369, 142, 191, 20, &G.scene->r.renderer, 0, 0, 0, 0, "Choose rendering engine");	
 
 	uiBlockBeginAlign(block);
Index: source/blender/src/sequence.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/sequence.c,v
retrieving revision 1.26
diff -u -b -B -r1.26 sequence.c
--- source/blender/src/sequence.c	21 Sep 2005 20:28:44 -0000	1.26
+++ source/blender/src/sequence.c	30 Sep 2005 20:05:06 -0000
@@ -1971,6 +1971,7 @@
 						oldx= R.rectx; oldy= R.recty;
 						/* needed because current 3D window cannot define the layers, like in a background render */
 						vd= G.vd;
+						if (R.r.renderer!=R_OPENGL)
 						G.vd= NULL;
 
 						RE_initrender(NULL);