diff options
| author | Ton Roosendaal <ton@blender.org> | 2013-03-16 21:12:39 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2013-03-16 21:12:39 +0400 |
| commit | 0f8660064aecf90203931c8c0b4fcf66bafdd5f6 (patch) | |
| tree | 3996fe0d76c1235585e77e7f1259fba0ccab18ea /source/blender/editors | |
| parent | 3be732f3ef7a8581a5c7dee01436350a1c203d53 (diff) | |
Bug fix, irc reported:
Using new off-screen backbuffer selection failed for Lasso in editmode.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/mesh/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_select.c | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt index 7e194d7ed5c..0a45dd6704b 100644 --- a/source/blender/editors/mesh/CMakeLists.txt +++ b/source/blender/editors/mesh/CMakeLists.txt @@ -26,6 +26,7 @@ set(INC ../../blenlib ../../blenloader ../../bmesh + ../../gpu ../../imbuf ../../makesdna ../../makesrna diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index cf776587d1f..534747486f0 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -66,6 +66,8 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "GPU_extensions.h" + #include "mesh_intern.h" #include "UI_resources.h" @@ -253,6 +255,9 @@ int EDBM_backbuf_border_mask_init(ViewContext *vc, const int mcords[][2], short dr = buf->rect; + if (vc->rv3d->gpuoffscreen) + GPU_offscreen_bind(vc->rv3d->gpuoffscreen); + /* draw the mask */ glDisable(GL_DEPTH_TEST); @@ -270,6 +275,9 @@ int EDBM_backbuf_border_mask_init(ViewContext *vc, const int mcords[][2], short glFinish(); /* to be sure readpixels sees mask */ + if (vc->rv3d->gpuoffscreen) + GPU_offscreen_unbind(vc->rv3d->gpuoffscreen); + /* grab mask */ bufmask = view3d_read_backbuf(vc, xmin, ymin, xmax, ymax); |