From 2167dc7f390468e196e64367e483366ea35767c7 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Tue, 18 Jan 2011 14:34:59 +0000 Subject: [PATCH] Bugfix, irc report: general view3d operator poll() was reading NULL caused by commit for fix [#25691] 16 hours ago. --- .../editors/space_view3d/view3d_select.c | 22 ++++++++++--------- 1 file 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; + if(ob) { + 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 && 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; + } } }