diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-01-18 17:34:59 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-01-18 17:34:59 +0300 |
| commit | 2167dc7f390468e196e64367e483366ea35767c7 (patch) | |
| tree | 4874ed6caf63c57603cd53f8180e5b177647a822 /source/blender/editors/space_view3d | |
| parent | bee3d783939441946591f4b891394f0cf16cc12d (diff) | |
Bugfix, irc report: general view3d operator poll() was reading NULL
caused by commit for fix [#25691] 16 hours ago.
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index c55a1bf1489..f85bdc437f3 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -222,17 +222,19 @@ static int view3d_selectable_data(bContext *C) if (!ED_operator_region_view3d_active(C)) return 0; - if (ob->mode & OB_MODE_EDIT) { - if(ob->type == OB_FONT) { - return 0; - } - } - else { - if (ob && ob->mode & OB_MODE_SCULPT) { - return 0; + if(ob) { + 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)) { - return 0; + else { + if (ob->mode & OB_MODE_SCULPT) { + return 0; + } + if (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT) && !paint_facesel_test(ob)) { + return 0; + } } } |