merge with trunk at r31523
[blender.git] / source / blender / editors / space_image / space_image.c
index 2866984781456c095b9914d539f32bd851047470..32e8be83bc5e50355f9738d60e5ad6d69120c0f2 100644 (file)
 #include "BKE_image.h"
 #include "BKE_mesh.h"
 #include "BKE_screen.h"
-#include "BKE_utildefines.h"
 #include "BKE_tessmesh.h"
 
-#include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
 #include "ED_mesh.h"
@@ -57,7 +55,6 @@
 #include "ED_uvedit.h"
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "RNA_access.h"
 
@@ -773,8 +770,6 @@ static void image_main_area_draw(const bContext *C, ARegion *ar)
 
        /* draw Grease Pencil - screen space only */
        draw_image_grease_pencil((bContext *)C, 0);
-
-       ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_PIXEL);
        
        /* scrollers? */
        /*scrollers= UI_view2d_scrollers_calc(C, v2d, V2D_UNIT_VALUES, V2D_GRID_CLAMP, V2D_ARG_DUMMY, V2D_ARG_DUMMY);