diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-16 18:36:15 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-16 18:36:15 +0400 |
| commit | fc576add9f0869c3612873c084497d831375f6d6 (patch) | |
| tree | dae88cf663af2fd4a3c16975696765dd017b139c /source/blender/editors | |
| parent | 5ff7ede1b5e50fd1c521dbf17760117c67be885e (diff) | |
Fix issue with linked dupli objects not being displayed in the viewport, if they
have no object bounding box. Better fix will be to figure out why they are the
bounding boxes are not made.
Thanks to Campbell to tracking down the commit that caused this.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 95797fd9afc..fdf438330f6 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -3586,7 +3586,7 @@ static int draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D } else { /* ob->bb was set by derived mesh system, do NULL check just to be sure */ - if (me->totpoly <= 4 || (ob->bb && ED_view3d_boundbox_clip(rv3d, ob->obmat, ob->bb))) { + if (me->totpoly <= 4 || (!ob->bb || ED_view3d_boundbox_clip(rv3d, ob->obmat, ob->bb))) { glsl = draw_glsl_material(scene, ob, v3d, dt); check_alpha = check_alpha_pass(base); |