diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-15 19:17:51 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-15 19:17:51 +0400 |
commit | 2390a2657e3ba1bde477d999c06d000491edbea8 (patch) | |
tree | 7d4a682136fd6d0542e959754abf00771d80ad46 /source/blender | |
parent | b6fd8ae97a31cac8f2164f3f14915b34964d0e19 (diff) |
Merged this part of code by mistake.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 2ee9fdd8d96..72f82b4aec5 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -3181,17 +3181,6 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar) 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); |