[Bf-blender-cvs] [09e072a] master: Fix T43858: Collision Bounds Display Bug

[Campbell Barton]

Commit: 09e072a24585e5e3b6df73bd618022c3d646d537
Author: Campbell Barton
Date:   Mon Mar 9 17:24:14 2015 +1100
Branches: master
https://developer.blender.org/rB09e072a24585e5e3b6df73bd618022c3d646d537

Fix T43858: Collision Bounds Display Bug

Was using draw-type when drawing BGE collision bounds.

===================================================================

M	source/blender/editors/space_view3d/drawobject.c

===================================================================

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 5f6a368..61c9891 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};