1 files changed, 278 insertions, 154 deletions

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index a9ab286b2dc..8cc8c976981 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1,5 +1,5 @@
 /**
- * $Id:
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -30,19 +30,13 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "DNA_action_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_customdata_types.h"
 #include "DNA_group_types.h"
 #include "DNA_key_types.h"
 #include "DNA_lamp_types.h"
-#include "DNA_object_types.h"
-#include "DNA_space_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_userdef_types.h"
-#include "DNA_view3d_types.h"
 #include "DNA_world_types.h"
 
 #include "MEM_guardedalloc.h"
@@ -75,27 +69,24 @@
 #include "BIF_glutil.h"
 
 #include "WM_api.h"
-#include "WM_types.h"
 #include "BLF_api.h"
 
 #include "ED_armature.h"
 #include "ED_keyframing.h"
 #include "ED_gpencil.h"
-#include "ED_mesh.h"
 #include "ED_screen.h"
 #include "ED_space_api.h"
 #include "ED_screen_types.h"
-#include "ED_util.h"
 #include "ED_transform.h"
-#include "ED_types.h"
+#include "ED_gpencil.h"
 
 #include "UI_interface.h"
 #include "UI_interface_icons.h"
 #include "UI_resources.h"
-#include "UI_view2d.h"
 
 #include "GPU_draw.h"
 #include "GPU_material.h"
+#include "GPU_extensions.h"
 
 #include "view3d_intern.h"	// own include
 
@@ -303,7 +294,7 @@ static void drawgrid(UnitSettings *unit, ARegion *ar, View3D *v3d, char **grid_u
 			while(i--) {
 				scalar= bUnit_GetScaler(usys, i);
 
-				dx_scalar = dx * scalar * unit->scale_length;
+				dx_scalar = dx * scalar / unit->scale_length;
 				if (dx_scalar < (GRID_MIN_PX*2))
 					continue;
 
@@ -476,11 +467,11 @@ static void drawfloor(Scene *scene, View3D *v3d)
 		
 		if (draw_line) {
 			glBegin(GL_LINE_STRIP);
-	        vert[0]= a*v3d->grid;
-	        vert[1]= grid;
-	        glVertex3fv(vert);
-	        vert[1]= -grid;
-	        glVertex3fv(vert);
+			vert[0]= a*v3d->grid;
+			vert[1]= grid;
+			glVertex3fv(vert);
+			vert[1]= -grid;
+			glVertex3fv(vert);
 			glEnd();
 		}
 	}
@@ -515,11 +506,11 @@ static void drawfloor(Scene *scene, View3D *v3d)
 		
 		if (draw_line) {
 			glBegin(GL_LINE_STRIP);
-	        vert[1]= a*v3d->grid;
-	        vert[0]= grid;
-	        glVertex3fv(vert );
-	        vert[0]= -grid;
-	        glVertex3fv(vert);
+			vert[1]= a*v3d->grid;
+			vert[0]= grid;
+			glVertex3fv(vert );
+			vert[0]= -grid;
+			glVertex3fv(vert);
 			glEnd();
 		}
 	}
@@ -830,7 +821,7 @@ static void draw_selected_name(Scene *scene, Object *ob, View3D *v3d)
 		}
 		
 		/* colour depends on whether there is a keyframe */
-		if (id_frame_has_keyframe((ID *)ob, /*frame_to_float(scene, CFRA)*/(float)(CFRA), v3d->keyflags))
+		if (id_frame_has_keyframe((ID *)ob, /*BKE_curframe(scene)*/(float)(CFRA), v3d->keyflags))
 			UI_ThemeColor(TH_VERTEX_SELECT);
 		else
 			UI_ThemeColor(TH_TEXT_HI);
@@ -855,7 +846,7 @@ static void draw_selected_name(Scene *scene, Object *ob, View3D *v3d)
 static void view3d_get_viewborder_size(Scene *scene, ARegion *ar, float size_r[2])
 {
 	float winmax= MAX2(ar->winx, ar->winy);
-	float aspect= (float) (scene->r.xsch*scene->r.xasp)/(scene->r.ysch*scene->r.yasp);
+	float aspect= (scene->r.xsch*scene->r.xasp) / (scene->r.ysch*scene->r.yasp);
 	
 	if(aspect>1.0) {
 		size_r[0]= winmax;
@@ -866,14 +857,16 @@ static void view3d_get_viewborder_size(Scene *scene, ARegion *ar, float size_r[2
 	}
 }
 
-void calc_viewborder(Scene *scene, ARegion *ar, View3D *v3d, rctf *viewborder_r)
+void calc_viewborder(Scene *scene, ARegion *ar, RegionView3D *rv3d, View3D *v3d, rctf *viewborder_r)
 {
-	RegionView3D *rv3d= ar->regiondata;
 	float zoomfac, size[2];
 	float dx= 0.0f, dy= 0.0f;
 	
 	view3d_get_viewborder_size(scene, ar, size);
 	
+	if (rv3d == NULL)
+		rv3d = ar->regiondata;
+	
 	/* magic zoom calculation, no idea what
 		* it signifies, if you find out, tell me! -zr
 		*/
@@ -982,13 +975,14 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d)
 	float x3, y3, x4, y4;
 	rctf viewborder;
 	Camera *ca= NULL;
+	RegionView3D *rv3d= (RegionView3D *)ar->regiondata;
 	
 	if(v3d->camera==NULL)
 		return;
 	if(v3d->camera->type==OB_CAMERA)
 		ca = v3d->camera->data;
 	
-	calc_viewborder(scene, ar, v3d, &viewborder);
+	calc_viewborder(scene, ar, rv3d, v3d, &viewborder);
 	x1= viewborder.xmin;
 	y1= viewborder.ymin;
 	x2= viewborder.xmax;
@@ -1077,7 +1071,7 @@ void backdrawview3d(Scene *scene, ARegion *ar, View3D *v3d)
 	rcti winrct;
 
 	if(base && (base->object->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT) ||
-		     paint_facesel_test(base->object)));
+			 paint_facesel_test(base->object)));
 	else if((base && (base->object->mode & OB_MODE_TEXTURE_PAINT)) &&
 		scene->toolsettings && (scene->toolsettings->imapaint.flag & IMAGEPAINT_PROJECT_DISABLE));
 	else if((base && (base->object->mode & OB_MODE_PARTICLE_EDIT)) && v3d->drawtype>OB_WIRE && (v3d->flag & V3D_ZBUF_SELECT));
@@ -1317,7 +1311,7 @@ static void draw_bgpic(Scene *scene, ARegion *ar, View3D *v3d)
 			if(rv3d->persp==RV3D_CAMOB) {
 				rctf vb;
 
-				calc_viewborder(scene, ar, v3d, &vb);
+				calc_viewborder(scene, ar, rv3d, v3d, &vb);
 
 				x1= vb.xmin;
 				y1= vb.ymin;
@@ -1362,7 +1356,7 @@ static void draw_bgpic(Scene *scene, ARegion *ar, View3D *v3d)
 				int mip= 0;
 
 				if(ibuf->mipmap[0]==NULL)
-					IMB_makemipmap(ibuf, 0, 0);
+					IMB_makemipmap(ibuf, 0);
 
 				while(tzoom < 1.0f && mip<8 && ibuf->mipmap[mip]) {
 					tzoom*= 2.0f;
@@ -1492,11 +1486,19 @@ int dupli_ob_sort(void *arg1, void *arg2)
 }
 #endif
 
+
+static DupliObject *dupli_step(DupliObject *dob)
+{
+	while(dob && dob->no_draw)
+		dob= dob->next;
+	return dob;
+}
+
 static void draw_dupli_objects_color(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int color)
-{	
+{
 	RegionView3D *rv3d= ar->regiondata;
 	ListBase *lb;
-	DupliObject *dob;
+	DupliObject *dob_prev= NULL, *dob, *dob_next;
 	Base tbase;
 	BoundBox bb, *bb_tmp; /* use a copy because draw_object, calls clear_mesh_caches */
 	GLuint displist=0;
@@ -1508,72 +1510,81 @@ static void draw_dupli_objects_color(Scene *scene, ARegion *ar, View3D *v3d, Bas
 	tbase.flag= OB_FROMDUPLI|base->flag;
 	lb= object_duplilist(scene, base->object);
 	// BLI_sortlist(lb, dupli_ob_sort); // might be nice to have if we have a dupli list with mixed objects.
-	
-	for(dob= lb->first; dob; dob= dob->next) {
-		if(dob->no_draw);
-		else {
-			tbase.object= dob->ob;
-			
-			/* extra service: draw the duplicator in drawtype of parent */
-			/* MIN2 for the drawtype to allow bounding box objects in groups for lods */
-			dt= tbase.object->dt;	tbase.object->dt= MIN2(tbase.object->dt, base->object->dt);
-			dtx= tbase.object->dtx; tbase.object->dtx= base->object->dtx;
-			
-			/* negative scale flag has to propagate */
-			transflag= tbase.object->transflag;
-			if(base->object->transflag & OB_NEG_SCALE)
-				tbase.object->transflag ^= OB_NEG_SCALE;
-			
-			UI_ThemeColorBlend(color, TH_BACK, 0.5);
-			
-			/* generate displist, test for new object */
-			if(use_displist==1 && dob->prev && dob->prev->ob!=dob->ob) {
-				use_displist= -1;
+
+	dob=dupli_step(lb->first);
+	if(dob) dob_next= dupli_step(dob->next);
+
+	for( ; dob ; dob_prev= dob, dob= dob_next, dob_next= dob_next ? dupli_step(dob_next->next) : NULL) {
+		tbase.object= dob->ob;
+
+		/* extra service: draw the duplicator in drawtype of parent */
+		/* MIN2 for the drawtype to allow bounding box objects in groups for lods */
+		dt= tbase.object->dt;	tbase.object->dt= MIN2(tbase.object->dt, base->object->dt);
+		dtx= tbase.object->dtx; tbase.object->dtx= base->object->dtx;
+
+		/* negative scale flag has to propagate */
+		transflag= tbase.object->transflag;
+		if(base->object->transflag & OB_NEG_SCALE)
+			tbase.object->transflag ^= OB_NEG_SCALE;
+
+		UI_ThemeColorBlend(color, TH_BACK, 0.5);
+
+		/* generate displist, test for new object */
+		if(dob_prev && dob_prev->ob != dob->ob) {
+			if(use_displist==1)
 				glDeleteLists(displist, 1);
-			}
-			/* generate displist */
-			if(use_displist == -1) {
-				
-				/* lamp drawing messes with matrices, could be handled smarter... but this works */
-
-				/* note, since this was added, its checked dob->type==OB_DUPLIGROUP
-				 * however this is very slow, it was probably needed for the NLA
-				 * offset feature (used in group-duplicate.blend but no longer works in 2.5)
-				 * so for now it should be ok to - campbell */
-				if(dob->ob->type==OB_LAMP || (dob->type==OB_DUPLIGROUP && dob->animated) || !(bb_tmp= object_get_boundbox(dob->ob)))
-					use_displist= 0;
-				else {
-					bb= *bb_tmp; /* must make a copy  */
-
-					/* disable boundbox check for list creation */
-					object_boundbox_flag(dob->ob, OB_BB_DISABLED, 1);
-					/* need this for next part of code */
-					unit_m4(dob->ob->obmat);	/* obmat gets restored */
-					
-					displist= glGenLists(1);
-					glNewList(displist, GL_COMPILE);
-					draw_object(scene, ar, v3d, &tbase, DRAW_CONSTCOLOR);
-					glEndList();
-					
-					use_displist= 1;
-					object_boundbox_flag(dob->ob, OB_BB_DISABLED, 0);
-				}
-			}
-			if(use_displist) {
-				glMultMatrixf(dob->mat);
-				if(boundbox_clip(rv3d, dob->mat, &bb))
-					glCallList(displist);
-				glLoadMatrixf(rv3d->viewmat);
+
+			use_displist= -1;
+		}
+
+		/* generate displist */
+		if(use_displist == -1) {
+
+			/* note, since this was added, its checked dob->type==OB_DUPLIGROUP
+			 * however this is very slow, it was probably needed for the NLA
+			 * offset feature (used in group-duplicate.blend but no longer works in 2.5)
+			 * so for now it should be ok to - campbell */
+
+			if(		(dob_next==NULL || dob_next->ob != dob->ob) || /* if this is the last no need  to make a displist */
+					(dob->ob->type == OB_LAMP) || /* lamp drawing messes with matrices, could be handled smarter... but this works */
+					(dob->type == OB_DUPLIGROUP && dob->animated) ||
+					!(bb_tmp= object_get_boundbox(dob->ob))
+			) {
+				// printf("draw_dupli_objects_color: skipping displist for %s\n", dob->ob->id.name+2);
+				use_displist= 0;
 			}
 			else {
-				copy_m4_m4(dob->ob->obmat, dob->mat);
+				// printf("draw_dupli_objects_color: using displist for %s\n", dob->ob->id.name+2);
+				bb= *bb_tmp; /* must make a copy  */
+
+				/* disable boundbox check for list creation */
+				object_boundbox_flag(dob->ob, OB_BB_DISABLED, 1);
+				/* need this for next part of code */
+				unit_m4(dob->ob->obmat);	/* obmat gets restored */
+
+				displist= glGenLists(1);
+				glNewList(displist, GL_COMPILE);
 				draw_object(scene, ar, v3d, &tbase, DRAW_CONSTCOLOR);
+				glEndList();
+
+				use_displist= 1;
+				object_boundbox_flag(dob->ob, OB_BB_DISABLED, 0);
 			}
-			
-			tbase.object->dt= dt;
-			tbase.object->dtx= dtx;
-			tbase.object->transflag= transflag;
 		}
+		if(use_displist) {
+			glMultMatrixf(dob->mat);
+			if(boundbox_clip(rv3d, dob->mat, &bb))
+				glCallList(displist);
+			glLoadMatrixf(rv3d->viewmat);
+		}
+		else {
+			copy_m4_m4(dob->ob->obmat, dob->mat);
+			draw_object(scene, ar, v3d, &tbase, DRAW_CONSTCOLOR);
+		}
+
+		tbase.object->dt= dt;
+		tbase.object->dtx= dtx;
+		tbase.object->transflag= transflag;
 	}
 	
 	/* Transp afterdraw disabled, afterdraw only stores base pointers, and duplis can be same obj */
@@ -1647,7 +1658,7 @@ void draw_depth_gpencil(Scene *scene, ARegion *ar, View3D *v3d)
 	v3d->zbuf= TRUE;
 	glEnable(GL_DEPTH_TEST);
 
-	draw_gpencil_3dview_ext(scene, ar, 1);
+	draw_gpencil_view3d_ext(scene, ar, 1);
 	
 	v3d->zbuf= zbuf;
 
@@ -1791,6 +1802,8 @@ static void gpu_update_lamps_shadows(Scene *scene, View3D *v3d)
 	Scene *sce;
 	Base *base;
 	Object *ob;
+	ARegion ar;
+	RegionView3D rv3d;
 	
 	shadows.first= shadows.last= NULL;
 	
@@ -1818,23 +1831,36 @@ static void gpu_update_lamps_shadows(Scene *scene, View3D *v3d)
 	for(shadow=shadows.first; shadow; shadow=shadow->next) {
 		/* this needs to be done better .. */
 		float viewmat[4][4], winmat[4][4];
-		int drawtype, lay, winsize, flag2;
+		int drawtype, lay, winsize, flag2=v3d->flag2;
 		
 		drawtype= v3d->drawtype;
 		lay= v3d->lay;
-		flag2= v3d->flag2 & V3D_SOLID_TEX;
 		
 		v3d->drawtype = OB_SOLID;
 		v3d->lay &= GPU_lamp_shadow_layer(shadow->lamp);
 		v3d->flag2 &= ~V3D_SOLID_TEX;
+		v3d->flag2 |= V3D_RENDER_OVERRIDE;
 		
 		GPU_lamp_shadow_buffer_bind(shadow->lamp, viewmat, &winsize, winmat);
-// XXX		drawview3d_render(v3d, viewmat, winsize, winsize, winmat, 1);
+
+		memset(&ar, 0, sizeof(ar));
+		memset(&rv3d, 0, sizeof(rv3d));
+
+		ar.regiondata= &rv3d;
+		ar.regiontype= RGN_TYPE_WINDOW;
+		rv3d.persp= RV3D_CAMOB;
+		copy_m4_m4(rv3d.winmat, winmat);
+		copy_m4_m4(rv3d.viewmat, viewmat);
+		invert_m4_m4(rv3d.viewinv, rv3d.viewmat);
+		mul_m4_m4m4(rv3d.persmat, rv3d.viewmat, rv3d.winmat);
+		invert_m4_m4(rv3d.persinv, rv3d.viewinv);
+
+		ED_view3d_draw_offscreen(scene, v3d, &ar, winsize, winsize, viewmat, winmat);
 		GPU_lamp_shadow_buffer_unbind(shadow->lamp);
 		
 		v3d->drawtype= drawtype;
 		v3d->lay= lay;
-		v3d->flag2 |= flag2;
+		v3d->flag2 = flag2;
 	}
 	
 	BLI_freelistN(&shadows);
@@ -1862,7 +1888,7 @@ static CustomDataMask get_viewedit_datamask(bScreen *screen, Scene *scene, Objec
 			}
 			if((view->drawtype == OB_TEXTURE) || ((view->drawtype == OB_SOLID) && (view->flag2 & V3D_SOLID_TEX))) {
 				mask |= CD_MASK_MTFACE | CD_MASK_MCOL;
-				
+
 				if(scene->gm.matmode == GAME_MAT_GLSL)
 					mask |= CD_MASK_ORCO;
 			}
@@ -1937,19 +1963,20 @@ void ED_view3d_draw_offscreen(Scene *scene, View3D *v3d, ARegion *ar, int winx,
 	bwiny= ar->winy;
 	ar->winx= winx;
 	ar->winy= winy;
-
+	
 	/* set flags */
 	G.f |= G_RENDER_OGL;
-	GPU_free_images();
+
+	/* free images which can have changed on frame-change
+	 * warning! can be slow so only free animated images - campbell */
+	GPU_free_images_anim();
 
 	/* set background color, fallback on the view background color */
 	if(scene->world) {
 		glClearColor(scene->world->horr, scene->world->horg, scene->world->horb, 0.0);
 	}
 	else {
-		float col[3];
-		UI_GetThemeColor3fv(TH_BACK, col);
-		glClearColor(col[0], col[1], col[2], 0.0); 	
+		UI_ThemeClearColor(TH_BACK);	
 	}
 
 	glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
@@ -2000,22 +2027,111 @@ void ED_view3d_draw_offscreen(Scene *scene, View3D *v3d, ARegion *ar, int winx,
 	}
 
 	/* draw grease-pencil stuff */
-	draw_gpencil_3dview_ext(scene, ar, 1);
+	draw_gpencil_view3d_ext(scene, ar, 1);
 
 	ED_region_pixelspace(ar);
 
 	/* draw grease-pencil stuff - needed to get paint-buffer shown too (since it's 2D) */
-	draw_gpencil_3dview_ext(scene, ar, 0);
+	draw_gpencil_view3d_ext(scene, ar, 0);
 
-	GPU_free_images();
+	/* freeing the images again here could be done after the operator runs, leaving for now */
+	GPU_free_images_anim();
 
 	/* restore size */
 	ar->winx= bwinx;
 	ar->winy= bwiny;
 
 	glPopMatrix();
+
+	glColor4ub(255, 255, 255, 255); // XXX, without this the sequencer flickers with opengl draw enabled, need to find out why - campbell
+
+	G.f &= ~G_RENDER_OGL;
 }
 
+/* utility func for ED_view3d_draw_offscreen */
+ImBuf *ED_view3d_draw_offscreen_imbuf(Scene *scene, View3D *v3d, ARegion *ar, int sizex, int sizey)
+{
+	RegionView3D *rv3d= ar->regiondata;
+	ImBuf *ibuf;
+	GPUOffScreen *ofs;
+
+	/* bind */
+	ofs= GPU_offscreen_create(sizex, sizey);
+	if(ofs == NULL)
+		return NULL;
+
+	GPU_offscreen_bind(ofs);
+
+	/* render 3d view */
+	if(rv3d->persp==RV3D_CAMOB && v3d->camera) {
+		float winmat[4][4];
+		float _clipsta, _clipend, _lens, _yco, _dx, _dy;
+		rctf _viewplane;
+
+		object_camera_matrix(&scene->r, v3d->camera, sizex, sizey, 0, winmat, &_viewplane, &_clipsta, &_clipend, &_lens, &_yco, &_dx, &_dy);
+
+		ED_view3d_draw_offscreen(scene, v3d, ar, sizex, sizey, NULL, winmat);
+	}
+	else {
+		ED_view3d_draw_offscreen(scene, v3d, ar, sizex, sizey, NULL, NULL);
+	}
+
+	/* read in pixels & stamp */
+	ibuf= IMB_allocImBuf(sizex, sizey, 24, IB_rect, 0);
+	glReadPixels(0, 0, sizex, sizey, GL_RGBA, GL_UNSIGNED_BYTE, ibuf->rect);
+
+	//if((scene->r.stamp & R_STAMP_ALL) && (scene->r.stamp & R_STAMP_DRAW))
+	//	BKE_stamp_buf(scene, NULL, rr->rectf, rr->rectx, rr->recty, 4);
+
+	/* unbind */
+	GPU_offscreen_unbind(ofs);
+	GPU_offscreen_free(ofs);
+
+	return ibuf;
+}
+
+/* creates own 3d views, used by the sequencer */
+ImBuf *ED_view3d_draw_offscreen_imbuf_simple(Scene *scene, int width, int height, int drawtype)
+{
+	View3D v3d;
+	ARegion ar;
+	RegionView3D rv3d;
+
+	memset(&v3d, 0, sizeof(v3d));
+	memset(&ar, 0, sizeof(ar));
+	memset(&rv3d, 0, sizeof(rv3d));
+
+	/* connect data */
+	v3d.regionbase.first= v3d.regionbase.last= &ar;
+	ar.regiondata= &rv3d;
+	ar.regiontype= RGN_TYPE_WINDOW;
+
+	v3d.camera= scene->camera;
+	v3d.lay= scene->lay;
+	v3d.drawtype = drawtype;
+	v3d.flag2 = V3D_RENDER_OVERRIDE;
+
+	rv3d.persp= RV3D_CAMOB;
+
+	copy_m4_m4(rv3d.viewinv, v3d.camera->obmat);
+	normalize_m4(rv3d.viewinv);
+	invert_m4_m4(rv3d.viewmat, rv3d.viewinv);
+
+	{
+		float _yco, _dx, _dy;
+		rctf _viewplane;
+		object_camera_matrix(&scene->r, v3d.camera, width, height, 0, rv3d.winmat, &_viewplane, &v3d.near, &v3d.far, &v3d.lens, &_yco, &_dx, &_dy);
+	}
+
+	mul_m4_m4m4(rv3d.persmat, rv3d.viewmat, rv3d.winmat);
+	invert_m4_m4(rv3d.persinv, rv3d.viewinv);
+
+	return ED_view3d_draw_offscreen_imbuf(scene, &v3d, &ar, width, height);
+
+	// seq_view3d_cb(scene, cfra, render_size, seqrectx, seqrecty);
+}
+
+
 /* NOTE: the info that this uses is updated in ED_refresh_viewport_fps(), 
  * which currently gets called during SCREEN_OT_animation_step.
  */
@@ -2053,15 +2169,15 @@ static void draw_viewport_fps(Scene *scene, ARegion *ar)
 		fps = fps / tot;
 	}
 #endif
-	
+
 	/* is this more then half a frame behind? */
 	if (fps+0.5 < FPS) {
 		UI_ThemeColor(TH_REDALERT);
-		sprintf(printable, "fps: %.2f", (float)fps);
+		BLI_snprintf(printable, sizeof(printable), "fps: %.2f", (float)fps);
 	} 
 	else {
 		UI_ThemeColor(TH_TEXT_HI);
-		sprintf(printable, "fps: %i", (int)(fps+0.5));
+		BLI_snprintf(printable, sizeof(printable), "fps: %i", (int)(fps+0.5));
 	}
 	
 	BLF_draw_default(22,  ar->winy-17, 0.0f, printable);
@@ -2075,22 +2191,26 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar)
 	Scene *sce;
 	Base *base;
 	Object *ob;
-		float col[3];
 	int retopo= 0, sculptparticle= 0;
 	Object *obact = OBACT;
 	char *grid_unit= NULL;
 
 	/* from now on all object derived meshes check this */
 	v3d->customdata_mask= get_viewedit_datamask(CTX_wm_screen(C), scene, obact);
-	
+
 	/* shadow buffers, before we setup matrices */
 	if(draw_glsl_material(scene, NULL, v3d, v3d->drawtype))
 		gpu_update_lamps_shadows(scene, v3d);
+	
+	/* reset default OpenGL lights if needed (i.e. after preferences have been altered) */
+	if (rv3d->rflag & RV3D_GPULIGHT_UPDATE) {
+		rv3d->rflag &= ~RV3D_GPULIGHT_UPDATE;
+		GPU_default_lights();
+	}
 
 	/* clear background */
-		UI_GetThemeColor3fv(TH_BACK, col);
-	glClearColor(col[0], col[1], col[2], 0.0); 
-		glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
+	UI_ThemeClearColor(TH_BACK);
+	glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
 	
 	/* setup view matrices */
 	view3d_main_area_setup_view(scene, v3d, ar, NULL, NULL);
@@ -2115,35 +2235,38 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar)
 	// needs to be done always, gridview is adjusted in drawgrid() now
 	rv3d->gridview= v3d->grid;
 	
-	if(rv3d->view==0 || rv3d->persp!=0) {
-		drawfloor(scene, v3d);
-		if(rv3d->persp==2) {
-			if(scene->world) {
-				if(scene->world->mode & WO_STARS) {
-					RE_make_stars(NULL, scene, star_stuff_init_func, star_stuff_vertex_func,
-								  star_stuff_term_func);
+	if ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
+
+		if(rv3d->view==0 || rv3d->persp != RV3D_ORTHO) {
+			drawfloor(scene, v3d);
+			if(rv3d->persp==RV3D_CAMOB) {
+				if(scene->world) {
+					if(scene->world->mode & WO_STARS) {
+						RE_make_stars(NULL, scene, star_stuff_init_func, star_stuff_vertex_func,
+									  star_stuff_term_func);
+					}
 				}
+				if(v3d->flag & V3D_DISPBGPICS) draw_bgpic(scene, ar, v3d);
 			}
-			if(v3d->flag & V3D_DISPBGPICS) draw_bgpic(scene, ar, v3d);
 		}
-	}
-	else {
-		ED_region_pixelspace(ar);
-		drawgrid(&scene->unit, ar, v3d, &grid_unit);
-		/* XXX make function? replaces persp(1) */
-		glMatrixMode(GL_PROJECTION);
-		glLoadMatrixf(rv3d->winmat);
-		glMatrixMode(GL_MODELVIEW);
-		glLoadMatrixf(rv3d->viewmat);
-		
-		if(v3d->flag & V3D_DISPBGPICS) {
-			draw_bgpic(scene, ar, v3d);
+		else {
+			ED_region_pixelspace(ar);
+			drawgrid(&scene->unit, ar, v3d, &grid_unit);
+			/* XXX make function? replaces persp(1) */
+			glMatrixMode(GL_PROJECTION);
+			glLoadMatrixf(rv3d->winmat);
+			glMatrixMode(GL_MODELVIEW);
+			glLoadMatrixf(rv3d->viewmat);
+
+			if(v3d->flag & V3D_DISPBGPICS) {
+				draw_bgpic(scene, ar, v3d);
+			}
 		}
 	}
 	
 	if(rv3d->rflag & RV3D_CLIPPING)
 		view3d_set_clipping(rv3d);
-	
+
 	/* draw set first */
 	if(scene->set) {
 		for(SETLOOPER(scene->set, base)) {
@@ -2164,7 +2287,7 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar)
 	
 	/* extra service in layerbuttons, showing used layers */
 	v3d->lay_used = 0;
-	
+
 	/* then draw not selected and the duplis, but skip editmode object */
 	for(base= scene->base.first; base; base= base->next) {
 		v3d->lay_used |= base->lay;
@@ -2201,8 +2324,6 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar)
 	
 //	REEB_draw();
 	
-//	if(scene->radio) RAD_drawall(v3d->drawtype>=OB_SOLID);
-	
 	/* Transp and X-ray afterdraw stuff */
 	view3d_draw_transp(scene, ar, v3d);
 	view3d_draw_xray(scene, ar, v3d, 1);	// clears zbuffer if it is used!
@@ -2227,12 +2348,14 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar)
 		glDisable(GL_DEPTH_TEST);
 	}
 	
-	/* draw grease-pencil stuff (3d-space strokes) */
-	//if (v3d->flag2 & V3D_DISPGP)
-		draw_gpencil_3dview((bContext *)C, 1);
-	
-	BDR_drawSketch(C);
-	
+	if ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
+		/* draw grease-pencil stuff (3d-space strokes) */
+		//if (v3d->flag2 & V3D_DISPGP)
+			draw_gpencil_view3d((bContext *)C, 1);
+
+		BDR_drawSketch(C);
+	}
+
 	ED_region_pixelspace(ar);
 	
 //	retopo_paint_view_update(v3d);
@@ -2240,14 +2363,17 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar)
 	
 	/* Draw particle edit brush XXX (removed) */
 	
-	if(rv3d->persp>1) drawviewborder(scene, ar, v3d);
+
+	if(rv3d->persp==RV3D_CAMOB) drawviewborder(scene, ar, v3d);
 	if(rv3d->rflag & RV3D_FLYMODE) drawviewborder_flymode(ar);
-	
-	/* draw grease-pencil stuff - needed to get paint-buffer shown too (since it's 2D) */
-//	if (v3d->flag2 & V3D_DISPGP)
-		draw_gpencil_3dview((bContext *)C, 0);
 
-	drawcursor(scene, ar, v3d);
+	if ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
+		/* draw grease-pencil stuff - needed to get paint-buffer shown too (since it's 2D) */
+	//	if (v3d->flag2 & V3D_DISPGP)
+			draw_gpencil_view3d((bContext *)C, 0);
+
+		drawcursor(scene, ar, v3d);
+	}
 	
 	if(U.uiflag & USER_SHOW_ROTVIEWICON)
 		draw_view_axis(rv3d);
@@ -2262,7 +2388,7 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar)
 	}
 	if (grid_unit) { /* draw below the viewport name */
 		UI_ThemeColor(TH_TEXT_HI);
-		BLF_draw_default(10,  ar->winy-(USER_SHOW_VIEWPORTNAME?40:20), 0.0f, grid_unit);
+		BLF_draw_default(22,  ar->winy-(USER_SHOW_VIEWPORTNAME?40:20), 0.0f, grid_unit);
 	}
 
 	ob= OBACT;
@@ -2275,5 +2401,3 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar)
 
 	v3d->flag |= V3D_INVALID_BACKBUF;
 }
-
-