Merging r58362 through r58463 from trunk into soc-2013-depsgraph_mt
[blender.git] / source / blender / editors / space_view3d / view3d_view.c
index 3638690a0a5ba6d7a781440fe2f6c6a3101ee967..aa7614779173e65bc03a5cf12a3b2fb28b2a74cf 100644 (file)
@@ -622,7 +622,7 @@ bool ED_view3d_boundbox_clip(RegionView3D *rv3d, float obmat[4][4], const BoundB
        int a, flag = -1, fl;
 
        if (bb == NULL) return true;
-       if (bb->flag & OB_BB_DISABLED) return true;
+       if (bb->flag & BOUNDBOX_DISABLED) return true;
 
        mul_m4_m4m4(mat, rv3d->persmat, obmat);