From fe0a7ea7a584a77d0164bf9283493e49a2447371 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 6 Aug 2010 18:11:49 +0000 Subject: Fix #23208: REGION_DRAW_POST_PIXEL callbacks only work in 3d view and image editor, but there's no reason they wouldn't work in all regions, so moved the function call. --- source/blender/editors/screen/area.c | 3 +++ source/blender/editors/space_image/space_image.c | 2 -- source/blender/editors/space_view3d/view3d_draw.c | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'source') diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index a97f8f128b9..3712ef01054 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -48,6 +48,7 @@ #include "ED_screen.h" #include "ED_screen_types.h" +#include "ED_space_api.h" #include "ED_types.h" #include "ED_fileselect.h" @@ -343,6 +344,8 @@ void ED_region_do_draw(bContext *C, ARegion *ar) else if(at->draw) { at->draw(C, ar); } + + ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_PIXEL); uiFreeInactiveBlocks(C, &ar->uiblocks); diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 3eae1438517..9cd67793747 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -776,8 +776,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); diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 6395e9e8be8..2be746a72ab 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -2433,8 +2433,6 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar) ob= OBACT; if(U.uiflag & USER_DRAWVIEWINFO) draw_selected_name(scene, ob, v3d); - - ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_PIXEL); /* XXX here was the blockhandlers for floating panels */ -- cgit v1.2.3