diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-01-18 01:37:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-18 01:37:24 +0300 |
| commit | 1a0d88a10825a692291be27385103820477a851a (patch) | |
| tree | 0eb21c648f7a2213c180466c7077eacaf5e2fdac /source/blender/editors/space_view3d/view3d_select.c | |
| parent | f6d73fdfeebdf97bc956a4297b720e0ad7a3264e (diff) | |
fix [#25691] Lasso select on 3D Text editing segfaults
poll function was incorrect.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_select.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 4bb263d3ed9..c55a1bf1489 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -218,16 +218,24 @@ void arrows_move_cursor(unsigned short event) static int view3d_selectable_data(bContext *C) { Object *ob = CTX_data_active_object(C); - + if (!ED_operator_region_view3d_active(C)) return 0; - - if (!CTX_data_edit_object(C)) - if (ob && ob->mode & OB_MODE_SCULPT) + + if (ob->mode & OB_MODE_EDIT) { + if(ob->type == OB_FONT) { return 0; - if (ob && ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT) && !paint_facesel_test(ob)) + } + } + else { + if (ob && ob->mode & OB_MODE_SCULPT) { return 0; - + } + if (ob && ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT) && !paint_facesel_test(ob)) { + return 0; + } + } + return 1; } |