[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50636] trunk/blender/source/blender/ editors/space_view3d/view3d_draw.c: Merged this part of code by mistake.

[Sergey Sharybin]

Revision: 50636
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50636
Author:   nazgul
Date:     2012-09-15 15:17:51 +0000 (Sat, 15 Sep 2012)
Log Message:
-----------
Merged this part of code by mistake.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2012-09-15 15:03:43 UTC (rev 50635)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2012-09-15 15:17:51 UTC (rev 50636)
@@ -3181,17 +3181,6 @@
 	const char *grid_unit = NULL;
 	int draw_border = (rv3d->persp == RV3D_CAMOB && (scene->r.mode & R_BORDER));
 
-	/* --- until we get a clue and make viewport threadsafe (temp mango change for stability) */
-	if (G.is_rendering) {
-		ED_region_pixelspace(ar);
-		glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-		UI_ThemeClearColor(TH_BACK);
-		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-		BLF_draw_default(10,10,0, "do do da da.. da da.. da da.. can't touch this!   it's render time", 512);
-		return;
-	}
-	/* --- end temp mango change */
-
 	/* draw viewport using opengl */
 	if (v3d->drawtype != OB_RENDER || !view3d_main_area_do_render_draw(C) || draw_border) {
 		view3d_main_area_draw_objects(C, ar, &grid_unit);