kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Bugfix, irc report: general view3d operator poll() was reading NULL

Browse Source 
caused by commit for fix [#25691] 16 hours ago.
This commit is contained in:
Ton Roosendaal 2011-01-18 14:34:59 +00:00
parent bee3d78393
commit 2167dc7f39
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/space_view3d/view3d_select.c
View File

@ -222,19 +222,21 @@ static int view3d_selectable_data(bContext *C)
if (!ED_operator_region_view3d_active(C)) if (!ED_operator_region_view3d_active(C))
return 0; return 0;
if(ob) {
if (ob->mode & OB_MODE_EDIT) { if (ob->mode & OB_MODE_EDIT) {
if(ob->type == OB_FONT) { if(ob->type == OB_FONT) {
return 0; return 0;
} }
} }
else { else {
if (ob && ob->mode & OB_MODE_SCULPT) { if (ob->mode & OB_MODE_SCULPT) {
return 0; return 0;
} }
if (ob && ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT) && !paint_facesel_test(ob)) { if (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT) && !paint_facesel_test(ob)) {
return 0; return 0;
} }
} }
}
return 1; return 1;
} }