[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31120] trunk/blender/source/blender/ editors: Fix #23208: REGION_DRAW_POST_PIXEL callbacks only work in 3d view and
Brecht Van Lommel
brecht at blender.org
Fri Aug 6 20:11:49 CEST 2010
Revision: 31120
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31120
Author: blendix
Date: 2010-08-06 20:11:49 +0200 (Fri, 06 Aug 2010)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
Modified: trunk/blender/source/blender/editors/screen/area.c
===================================================================
--- trunk/blender/source/blender/editors/screen/area.c 2010-08-06 17:54:02 UTC (rev 31119)
+++ trunk/blender/source/blender/editors/screen/area.c 2010-08-06 18:11:49 UTC (rev 31120)
@@ -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 @@
else if(at->draw) {
at->draw(C, ar);
}
+
+ ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_PIXEL);
uiFreeInactiveBlocks(C, &ar->uiblocks);
Modified: trunk/blender/source/blender/editors/space_image/space_image.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/space_image.c 2010-08-06 17:54:02 UTC (rev 31119)
+++ trunk/blender/source/blender/editors/space_image/space_image.c 2010-08-06 18:11:49 UTC (rev 31120)
@@ -776,8 +776,6 @@
/* 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);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2010-08-06 17:54:02 UTC (rev 31119)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2010-08-06 18:11:49 UTC (rev 31120)
@@ -2433,8 +2433,6 @@
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 */
More information about the Bf-blender-cvs
mailing list