diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-21 01:05:22 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-21 01:05:22 +0400 |
| commit | cac0e48dfb0f568ef83ff014647f0193a3a03a66 (patch) | |
| tree | cafe3acc27c91238b93cef34268f90e212dc2ac3 /source/blender/editors/space_image | |
| parent | 487a5045c91e1f910e947ed53a2f5b0e652b855b (diff) | |
Region post redraw is now split up in a view space and pixel space
part. This fixes a bug where transform help line drawing would not
work with view clipping and mess up the z-buffer. This avoids the
transform code having to figure out what kind of opengl state is
enabled and disable it temporarily.
Diffstat (limited to 'source/blender/editors/space_image')
| -rw-r--r-- | source/blender/editors/space_image/image_draw.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_image/space_image.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c index a42fec30c45..46ec41eda58 100644 --- a/source/blender/editors/space_image/image_draw.c +++ b/source/blender/editors/space_image/image_draw.c @@ -173,8 +173,6 @@ void draw_image_info(ARegion *ar, int channels, int x, int y, char *cp, float *f { char str[256]; int ofs; - - ED_region_pixelspace(ar); ofs= sprintf(str, "X: %d Y: %d ", x, y); if(cp) diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index ffc737eb9af..8d7295e9f20 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1539,7 +1539,7 @@ static int sample_invoke(bContext *C, wmOperator *op, wmEvent *event) info= MEM_callocN(sizeof(ImageSampleInfo), "ImageSampleInfo"); info->art= ar->type; - info->draw_handle = ED_region_draw_cb_activate(ar->type, sample_draw, info, REGION_DRAW_POST); + info->draw_handle = ED_region_draw_cb_activate(ar->type, sample_draw, info, REGION_DRAW_POST_PIXEL); op->customdata= info; sample_apply(C, op, event); diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 115f970046f..36d1573a12c 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -431,15 +431,17 @@ static void image_main_area_draw(const bContext *C, ARegion *ar) UI_view2d_view_ortho(C, v2d); draw_uvedit_main(sima, ar, scene, obedit); - ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST); + ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_VIEW); /* Grease Pencil too (in addition to UV's) */ draw_image_grease_pencil((bContext *)C, 1); UI_view2d_view_restore(C); - + /* 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); |