forked from bartvdbraak/blender
Bugfix, irc report: general view3d operator poll() was reading NULL
caused by commit for fix [#25691] 16 hours ago.
This commit is contained in:
parent
bee3d78393
commit
2167dc7f39
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user