svn merge ^/trunk/blender -r43524:43530
[blender.git] / source / blender / editors / space_view3d / view3d_select.c
index 38956cd94012d3962d4472bdd934c034039f0ee4..b42174416406e8045b54b20fd66322d6f15850c8 100644 (file)
@@ -265,7 +265,9 @@ static int view3d_selectable_data(bContext *C)
                        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) && !paint_vertsel_test(ob)) {
+                       if ((ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT)) &&
+                           !paint_facesel_test(ob) && !paint_vertsel_test(ob))
+                       {
                                return 0;
                        }
                }