diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-03-09 09:24:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-03-09 09:24:14 +0300 |
| commit | 09e072a24585e5e3b6df73bd618022c3d646d537 (patch) | |
| tree | 92e2f8a685ad68dd2aada3c8837c7a68794dda02 /source/blender/editors/space_view3d | |
| parent | 29e5de3728479d4e38baae1c94b5e4ca8e1da871 (diff) | |
Fix T43858: Collision Bounds Display Bug
Was using draw-type when drawing BGE collision bounds.
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 5f6a368faa9..61c9891e201 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -7830,10 +7830,10 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short if ((dt <= OB_SOLID) && !render_override) { if (((ob->gameflag & OB_DYNAMIC) && - !ELEM(ob->collision_boundtype, OB_BOUND_TRIANGLE_MESH, OB_BOUND_CONVEX_HULL)) || + ((ob->gameflag & OB_BOUNDS) == 0)) || ((ob->gameflag & OB_BOUNDS) && - (ob->boundtype == OB_BOUND_SPHERE))) + (ob->collision_boundtype == OB_BOUND_SPHERE))) { float imat[4][4], vec[3] = {0.0f, 0.0f, 0.0f}; |